Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java =================================================================== diff -u -r12640 -r12655 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java (.../GodownEntryItemManagerImpl.java) (revision 12640) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java (.../GodownEntryItemManagerImpl.java) (revision 12655) @@ -1,17 +1,27 @@ package com.forgon.disinfectsystem.diposablegoods.service; +import java.text.ParseException; +import java.util.Date; import java.util.List; +import net.sf.json.JSONObject; + import org.apache.commons.lang.StringUtils; import com.forgon.databaseadapter.service.DateQueryAdapter; +import com.forgon.directory.model.OrgUnit; +import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; +import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; +import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; public class GodownEntryItemManagerImpl implements GodownEntryItemManager { private ObjectDao objectDao; private DateQueryAdapter dateQueryAdapter; + private WareHouseManager wareHouseManager; public void setObjectDao(ObjectDao objectDao) { this.objectDao = objectDao; @@ -21,6 +31,10 @@ this.dateQueryAdapter = dateQueryAdapter; } + public void setWareHouseManager(WareHouseManager wareHouseManager) { + this.wareHouseManager = wareHouseManager; + } + @SuppressWarnings("unchecked") @Override public List getGodownEntryItemList(String startDateTime, @@ -33,4 +47,91 @@ return objectDao.findBySql(GodownEntryItem.class.getSimpleName(), sql, orderField); } + @Override + public GodownEntryItem getGodownEntryItemById(String id) { + return (GodownEntryItem) objectDao.getByProperty( + GodownEntryItem.class.getSimpleName(), "id", Long.valueOf(id)); + } + + @Override + public void setDefaultWareHouse(GodownEntryItem item, OrgUnit orgUnit) { + if(item == null){ + throw new IllegalArgumentException("item不能为空"); + } + List list = wareHouseManager.getWareHouseListByOrgUnit(orgUnit); + if(list != null && !list.isEmpty()){ + WareHouse wareHouse = list.get(0); + if(wareHouse != null){ + setWareHouse(item,wareHouse); + } + } + } + + @Override + public void setWareHouse(GodownEntryItem item, WareHouse wareHouse) { + if(wareHouse == null){ + throw new IllegalArgumentException("wareHouse不能为空"); + } + setWareHouse(item,wareHouse.getId(),wareHouse.getName()); + } + + @Override + public void setWareHouse(GodownEntryItem item, Long wareHouseId, + String wareHouseName) { + if(item == null){ + throw new IllegalArgumentException("item不能为空"); + } + item.setWareHouseId(wareHouseId); + item.setWareHouseName(wareHouseName); + } + + @Override + public GodownEntryItem parseGodownEntryItem(JSONObject itemObject) { + if(itemObject == null){ + return null; + } + + Long itemId = JSONUtil.optLong(itemObject,"id",null); + Long diposableGoodsID = JSONUtil.optLong(itemObject,"diposableGoodsID",null);// 一次性物品id + Long batchID = JSONUtil.optLong(itemObject,"batchID",null);// 一次性物品批次id + Long identificationID = JSONUtil.optLong(itemObject,"identificationID",null);// 一次性物品id + String identification = itemObject.optString("identification");// 标识号id + String batchNumber = itemObject.optString("batchNumber");// 批次号 + int amount = Integer.valueOf(itemObject.optString("amount"));// 数量 + Date expDate; + try { + expDate = GodownEntryItem.DATE_FORMAT.parse(itemObject.optString("expDate")); + } catch (ParseException e) { + e.printStackTrace(); + throw new RuntimeException("日期格式错误!"); + } + + double cost = Double.valueOf(itemObject.optString("cost"));// 价格 + String certification = itemObject.optString("certification");// 注册证号 + String supplierName = itemObject.optString("supplierName");// 供应商 + + String sterileBatchNumber = itemObject.optString("sterileBatchNumber");// 灭菌批次 + String manufacturer = itemObject.optString("manufacturer");// 生产厂家 + String producingArea = itemObject.optString("producingArea");// 产地 + + GodownEntryItem godownEntryItem = new GodownEntryItem(); + godownEntryItem.setId(itemId); + godownEntryItem.setDiposableGoodsID(diposableGoodsID); + godownEntryItem.setBatchID(batchID); + godownEntryItem.setIdentificationID(identificationID); + godownEntryItem.setIdentification(identification); + DiposableGoods diposableGoods = new DiposableGoods(); + diposableGoods.setId(diposableGoodsID); + godownEntryItem.setDiposableGoods(diposableGoods); + godownEntryItem.setAmount(new Long(amount)); + godownEntryItem.setCost(cost); + godownEntryItem.setBatchNumber(batchNumber); + godownEntryItem.setExpDate(expDate); + godownEntryItem.setCertification(certification); + godownEntryItem.setSupplierName(supplierName); + godownEntryItem.setSterileBatchNumber(sterileBatchNumber); + godownEntryItem.setManufacturer(manufacturer); + godownEntryItem.setProducingArea(producingArea); + return godownEntryItem; + } } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java =================================================================== diff -u -r12643 -r12655 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 12643) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 12655) @@ -24,6 +24,7 @@ import com.forgon.component.grid.GridManager; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager; +import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryItemManager; import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryManager; import com.forgon.disinfectsystem.diposablegoods.service.IdentificationOfDiposableGoodsManager; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodBatchStock; @@ -46,6 +47,8 @@ private GodownEntry godownEntry = new GodownEntry(); private GodownEntryManager godownEntryManager; + + private GodownEntryItemManager godownEntryItemManager; private DiposableGoodBatchStockManager diposableGoodBatchStockManager; @@ -70,6 +73,11 @@ this.godownEntryManager = godownEntryManager; } + public void setGodownEntryItemManager( + GodownEntryItemManager godownEntryItemManager) { + this.godownEntryItemManager = godownEntryItemManager; + } + public void setDiposableGoodBatchStockManager( DiposableGoodBatchStockManager diposableGoodBatchStockManager) { this.diposableGoodBatchStockManager = diposableGoodBatchStockManager; @@ -173,78 +181,20 @@ JSONObject formParamsObj = JSONObject.fromObject(formParams); // 表单参数 if(StringUtils.isNotBlank(formParams)){ - Long id = formParamsObj.optLong("id"); - String remark = formParamsObj.optString("remark"); - String timeStr = formParamsObj.optString("time"); - entry.setId(id); - entry.setRemark(remark); - Date time; - try { - time = GodownEntryItem.DATE_FORMAT.parse(timeStr); - } catch (ParseException e) { - e.printStackTrace(); - throw new RuntimeException("日期格式错误!"); - } - entry.setTime(time); + godownEntryManager.updateGodownEntryInfo(entry, formParamsObj); } // items列表 setGodownEntryItemsFromParams(entry, items); } // 设置items参数 private void setGodownEntryItemsFromParams(GodownEntry entry,String items){ - // items列表 - List godownEntryItems = entry.getItemsList(); JSONArray itemsArray = JSONArray.fromObject(items); int size = itemsArray.size(); for (int i = 0; i < size; ++i) { JSONObject obj = itemsArray.getJSONObject(i); if (obj != null) { - GodownEntryItem godownEntryItem = new GodownEntryItem(); - Long itemId = JSONUtil.optLong(obj,"id",null); - godownEntryItem.setId(itemId); - - Long diposableGoodsID = JSONUtil.optLong(obj,"diposableGoodsID",null);// 一次性物品id - Long batchID = JSONUtil.optLong(obj,"batchID",null);// 一次性物品批次id - Long identificationID = JSONUtil.optLong(obj,"identificationID",null);// 一次性物品id - String identification = obj.optString("identification");// 标识号id - String batchNumber = obj.optString("batchNumber");// 批次号 - int amount = Integer.valueOf(obj.optString("amount"));// 数量 - Date expDate; - try { - expDate = GodownEntryItem.DATE_FORMAT.parse(obj - .optString("expDate")); - } catch (ParseException e) { - e.printStackTrace(); - throw new RuntimeException("日期格式错误!"); - } - - double cost = Double.valueOf(obj.optString("cost"));// 价格 - String certification = obj.optString("certification");// 注册证号 - String supplierName = obj.optString("supplierName");// 供应商 - - String sterileBatchNumber = obj.optString("sterileBatchNumber");// 灭菌批次 - String manufacturer = obj.optString("manufacturer");// 生产厂家 - String producingArea = obj.optString("producingArea");// 产地 - - godownEntryItem.setGodownEntry(entry); - godownEntryItem.setDiposableGoodsID(diposableGoodsID); - godownEntryItem.setBatchID(batchID); - godownEntryItem.setIdentificationID(identificationID); - godownEntryItem.setIdentification(identification); - DiposableGoods diposableGoods = new DiposableGoods(); - diposableGoods.setId(diposableGoodsID); - godownEntryItem.setDiposableGoods(diposableGoods); - godownEntryItem.setAmount(new Long(amount)); - godownEntryItem.setCost(cost); - godownEntryItem.setBatchNumber(batchNumber); - godownEntryItem.setExpDate(expDate); - godownEntryItem.setCertification(certification); - godownEntryItem.setSupplierName(supplierName); - godownEntryItem.setSterileBatchNumber(sterileBatchNumber); - godownEntryItem.setManufacturer(manufacturer); - godownEntryItem.setProducingArea(producingArea); - godownEntryItems.add(godownEntryItem); + godownEntryManager.addItemToGodownEntry(entry, obj); } } } @@ -286,17 +236,17 @@ try { String id = StrutsParamUtils.getPraramValue("id", ""); - GodownEntry original = new GodownEntry(); GodownEntry entry = godownEntry; if (StringUtils.isNotBlank(id)) { + GodownEntry original = new GodownEntry(); // 更新入库单,里面的item有可能会更新，新建，删除标识号。 buildGodownEntryParamsForUpdate(original, entry); godownEntryManager.updateGodownEntry_TRANS_REQUIRED(original, entry, returnMsg); } else { // 保存入库单,里面的item一定都是新建标识号对象,并且需要更新批次属性。 - entry = godownEntry; + //entry = godownEntry; buildGodownEntryParamsForSave(entry); entry.setTime(new Date()); godownEntryManager.saveGodownEntry_TRANS_REQUIRED(entry, returnMsg); @@ -353,8 +303,7 @@ DiposableGoodBatchStock diposableGoodBatchStock = diposableGoodBatchStockManager .getDiposableGoodBatchStock(diposableGoodsId, batchNumber); - GodownEntryItem godownEntryItem = (GodownEntryItem) godownEntryManager - .getGodownEntryItemById(itemId); + GodownEntryItem godownEntryItem = godownEntryItemManager.getGodownEntryItemById(itemId); String specification = godownEntryItem.getDiposableGoods() .getSpecification(); if (StringUtils.isBlank(specification)) { Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java =================================================================== diff -u -r12641 -r12655 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 12641) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 12655) @@ -1,6 +1,7 @@ package com.forgon.disinfectsystem.diposablegoods.service; import java.math.BigDecimal; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -24,9 +25,11 @@ import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.diposablegoods.service.param.AddOrOutStorageParams; import com.forgon.disinfectsystem.diposablegoods.util.DiposableGoodsUtils; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodBatchStock; @@ -38,6 +41,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; +import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem; @@ -50,6 +54,7 @@ import com.forgon.tools.MathTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.util.SqlUtils; @@ -73,6 +78,10 @@ private SupplyRoomConfigManager supplyRoomConfigManager; + private GodownEntryItemManager godownEntryItemManager; + + private WareHouseManager wareHouseManager; + public void setWriteBackInventoryHelper( WriteBackInventoryHelper writeBackInventoryHelper) { this.writeBackInventoryHelper = writeBackInventoryHelper; @@ -110,6 +119,15 @@ this.supplyRoomConfigManager = supplyRoomConfigManager; } + public void setGodownEntryItemManager( + GodownEntryItemManager godownEntryItemManager) { + this.godownEntryItemManager = godownEntryItemManager; + } + + public void setWareHouseManager(WareHouseManager wareHouseManager) { + this.wareHouseManager = wareHouseManager; + } + public void saveOrUpdate(GodownEntry godownEntry) { objectDao.saveOrUpdate(godownEntry); } @@ -123,11 +141,6 @@ GodownEntry.class.getSimpleName(), "id", Long.valueOf(id)); } - public GodownEntryItem getGodownEntryItemById(String id) { - return (GodownEntryItem) objectDao.getByProperty( - GodownEntryItem.class.getSimpleName(), "id", Long.valueOf(id)); - } - private void delete(GodownEntry godownEntry) { // 回写物资系统 if (writeBackInventoryHelper != null) { @@ -306,7 +319,7 @@ // 如果这个itemiD存在，说明之前有了一个退库单明细，否则是新加进去的 if (StringUtils.isNotBlank(itemId) && StringUtils.isNumeric(itemId)) { - godownEntryItem = (GodownEntryItem) getGodownEntryItemById(itemId); + godownEntryItem = godownEntryItemManager.getGodownEntryItemById(itemId); } else { godownEntryItem = new GodownEntryItem(); } @@ -861,12 +874,27 @@ } // 更新入库单属性 updateGodownEntryProperties(original, entry, curGodownEntry); + setGodownEntryDefaultWareHouse(curGodownEntry); + setGodownEntrySubType(curGodownEntry, GodownEntry.SUBTYPE_MANUE_IN); + syncGodownEntryWareHouse(curGodownEntry); // 更新入库单对象 saveOrUpdate(curGodownEntry); // 设置GodownEntryItem详细列表 setReturnDetails(curGodownEntry, idToBatchStockMap,result); } - + /** + * 同步入库单、出库单、调拨单的物品的仓库，使之与单的对应属性一致 + * @param original + */ + private void syncGodownEntryWareHouse(GodownEntry entry){ + if(entry != null){ + Long wareHouseId = entry.getWareHouseId(); + String wareHouseName = entry.getWareHouseName(); + for(GodownEntryItem item : entry.getItemsList()){ + godownEntryItemManager.setWareHouse(item, wareHouseId,wareHouseName); + } + } + } // 获取并锁定一次性物品相关资源 private void lockAndGetDiposableGoodsResources(Set diposableGoodsIDsSet, Set batchIdsSet, Set batchNumbersSet, @@ -1611,4 +1639,95 @@ tousseList = loadToussePrintData(list); jsonObject.put("goods", tousseList); } + + /** + * 获取当前登录用户所属科室的默认仓库 + * @return + */ + private WareHouse getLoginUserDefaultWareHouse(){ + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + if(loginUserData != null){ + OrgUnit orgUnit = orgUnitManager.getByCode(loginUserData.getCurrentOrgUnitCode()); + List list = wareHouseManager.getWareHouseListByOrgUnit(orgUnit); + if(list != null && !list.isEmpty()){ + return list.get(0); + } + } + return null; + } + @Override + public void addItemToGodownEntry(GodownEntry entry, JSONObject itemObject) { + if(entry == null || itemObject == null){ + throw new IllegalArgumentException("entry和itemObject都不能为空"); + } + + GodownEntryItem godownEntryItem = godownEntryItemManager.parseGodownEntryItem(itemObject); + godownEntryItem.setGodownEntry(entry); + entry.getItemsList().add(godownEntryItem); + } + + @Override + public void updateGodownEntryInfo(GodownEntry entry, + JSONObject godownEntryInfo) { + if(entry == null || godownEntryInfo == null){ + return; + } + Long id = godownEntryInfo.optLong("id"); + String remark = godownEntryInfo.optString("remark"); + String timeStr = godownEntryInfo.optString("time"); + entry.setId(id); + entry.setRemark(remark); + Date time; + try { + time = GodownEntryItem.DATE_FORMAT.parse(timeStr); + } catch (ParseException e) { + e.printStackTrace(); + throw new RuntimeException("日期格式错误!"); + } + entry.setTime(time); + } + + private void setWareHouse(GodownEntry entry,WareHouse wareHouse){ + if(entry == null){ + throw new IllegalArgumentException("entry不能为空"); + } + if(wareHouse != null){ + entry.setWareHouseId(wareHouse.getId()); + entry.setWareHouseName(wareHouse.getName()); + } + } + @Override + public void setGodownEntryDefaultWareHouse(GodownEntry entry,OrgUnit orgUnit) { + if(entry != null){ + WareHouse wh = wareHouseManager.getWareHouseById(entry.getWareHouseId()); + if(wh == null){ + List list = wareHouseManager.getWareHouseListByOrgUnit(orgUnit); + if(list != null && !list.isEmpty()){ + setWareHouse(entry,list.get(0)); + } + } + } + } + @Override + public void setGodownEntryDefaultWareHouse(GodownEntry entry,String orgUnitCoding){ + setGodownEntryDefaultWareHouse(entry,orgUnitManager.getByCode(orgUnitCoding)); + } + + @Override + public void setGodownEntryDefaultWareHouse(GodownEntry entry) { + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + if(loginUserData != null){ + setGodownEntryDefaultWareHouse(entry,loginUserData.getCurrentOrgUnitCode()); + } + } + /** + * 设置入库单的子类型 + * @param entry + * @param subType + */ + private void setGodownEntrySubType(GodownEntry entry,String subType){ + if(entry != null){ + entry.setSubType(subType); + } + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r12652 -r12655 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12652) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12655) @@ -41,9 +41,9 @@ String sql = " where 1=1 "; if(orgUnit != null){ if(orgUnit.getId() != null && orgUnit.getId() != 0){ - sql += " orgUnitId = " + orgUnit.getId(); + sql += " and orgUnitId = " + orgUnit.getId(); }else if(StringUtils.isNotBlank(orgUnit.getOrgUnitCoding())){ - sql += " orgUnitCode = " + orgUnit.getOrgUnitCoding(); + sql += " and orgUnitCode = '" + orgUnit.getOrgUnitCoding() + "'"; }else{ return null; } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java =================================================================== diff -u -r12531 -r12655 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java (.../GodownEntryManager.java) (revision 12531) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java (.../GodownEntryManager.java) (revision 12655) @@ -5,6 +5,7 @@ import net.sf.json.JSONObject; +import com.forgon.directory.model.OrgUnit; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; @@ -13,8 +14,6 @@ public void saveOrUpdate(GodownEntry godownEntry); public GodownEntry getGodownEntryById(String id); - - public GodownEntryItem getGodownEntryItemById(String id); public Map deleteGodownEntryById_TRANS_NEW(String id); @@ -51,4 +50,32 @@ public void updateGodownOutEntry_TRANS_MANDATORY(GodownEntry original,GodownEntry entry,Map result); public void loadGodownEntryPrintData(String[] invoiceIds,JSONObject jsonObject); + /** + * 向入库单\出库单\调拨单添加物品,添加的物品的信息以json对象表示 + * @param entry 要添加物品的入库单\出库单 + * @param itemObject 物品详细信息的json对象 + */ + public void addItemToGodownEntry(GodownEntry entry,JSONObject itemObject); + /** + * 更新入库单\出库单\调拨单的信息 + * @param entry + * @param godownEntryInfo + */ + public void updateGodownEntryInfo(GodownEntry entry,JSONObject godownEntryInfo); + /** + * 设置入库单\出库单\调拨单到当前登录用户所属科室的默认仓库 + * @param entry + */ + public void setGodownEntryDefaultWareHouse(GodownEntry entry); + /** + * 设置入库单\出库单\调拨单到对应科室的默认仓库 + * @param entry + */ + public void setGodownEntryDefaultWareHouse(GodownEntry entry, OrgUnit orgUnit); + /** + * 设置入库单\出库单\调拨单到对应科室的默认仓库 + * @param entry 入库单\出库单\调拨单 + * @param orgUnitCoding 科室编码 + */ + public void setGodownEntryDefaultWareHouse(GodownEntry entry,String orgUnitCoding); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java =================================================================== diff -u -r12645 -r12655 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java (.../GodownEntry.java) (revision 12645) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java (.../GodownEntry.java) (revision 12655) @@ -48,6 +48,14 @@ */ private String subType; + public static final String SUBTYPE_MANUE_IN = "手工入库"; + public static final String SUBTYPE_MANUE_OUT = "手工出库"; + public static final String SUBTYPE_SYNC_IN = "同步入库"; + public static final String SUBTYPE_SYNC_OUT = "同步出库"; + public static final String SUBTYPE_IMPORT_IN = "导入入库"; + public static final String SUBTYPE_MOVE_IN = "调拨入库"; + public static final String SUBTYPE_MOVE_OUT = "调拨出库"; + private Double totalPrice;//总价 private String supplierName;//供应商 Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java =================================================================== diff -u -r12640 -r12655 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java (.../GodownEntryItemManager.java) (revision 12640) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java (.../GodownEntryItemManager.java) (revision 12655) @@ -2,8 +2,38 @@ import java.util.List; +import net.sf.json.JSONObject; + +import com.forgon.directory.model.OrgUnit; +import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; +import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; public interface GodownEntryItemManager { + public GodownEntryItem getGodownEntryItemById(String id); public List getGodownEntryItemList(String startDate,String endDate,String supplier,String orderField); + /** + * 设置物品到对应科室的默认仓库 + * @param entry + */ + public void setDefaultWareHouse(GodownEntryItem item, OrgUnit orgUnit); + /** + * 设置物品到指定的仓库 + * @param item + * @param wareHouse + */ + public void setWareHouse(GodownEntryItem item, WareHouse wareHouse); + /** + * 设置物品到指定的仓库 + * @param item + * @param wareHouseId + * @param wareHouseName + */ + public void setWareHouse(GodownEntryItem item, Long wareHouseId,String wareHouseName); + /** + * 转换json对象为GodownEntryItem + * @param itemObject + * @return 以json对象的信息创建的GodownEntryItem + */ + public GodownEntryItem parseGodownEntryItem(JSONObject itemObject); }