Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java =================================================================== diff -u -r12581 -r12802 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 12581) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 12802) @@ -5,6 +5,8 @@ package com.forgon.disinfectsystem.basedatamanager.toussedefinition.service; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.List; @@ -18,6 +20,8 @@ import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; 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.goodsstock.GoodsStock; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.packing.PackingRecord; import com.forgon.systemsetting.model.HttpOption; @@ -214,4 +218,43 @@ } return abbreviation; } + /** + * 创建器械包的库存 + * @param tousseInstance 器械包 + * @param wareHouse 仓库 + * @return + */ + public static GoodsStock newGoodsStock(TousseInstance tousseInstance,WareHouse wareHouse){ + if(tousseInstance == null || wareHouse == null){ + return null; + } + GoodsStock goodsStock = new GoodsStock(); + goodsStock.setAmount(1); + goodsStock.setGoodsType(GoodsStock.TYPE_TOUSSE); + goodsStock.setName(tousseInstance.getTousseName()); + goodsStock.setOrgUnitCode(wareHouse.getOrgUnitCode()); + goodsStock.setOrgUnitName(wareHouse.getOrgUnitName()); + goodsStock.setTousseDefinitionId(tousseInstance.getTousseDefinition().getId()); + goodsStock.setWareHouseId(wareHouse.getId()); + goodsStock.setWareHouseName(wareHouse.getName()); + return goodsStock; + } + /** + * 创建器械包的库存 + * @param tousseInstance 器械包集合 + * @param wareHouse 仓库 + * @return + */ + public static List newGoodsStockList(Collection tousseInstances,WareHouse wareHouse){ + List goodsStocks = new ArrayList(); + if(tousseInstances != null){ + for(TousseInstance ti : tousseInstances){ + GoodsStock goodsStock = newGoodsStock(ti,wareHouse); + if(goodsStock != null){ + goodsStocks.add(goodsStock); + } + } + } + return goodsStocks; + } }