Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r16656 -r16699 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 16656) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 16699) @@ -21,8 +21,6 @@ import org.apache.commons.beanutils.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -117,7 +115,8 @@ * 需要改进为读取jdbc.properties文件中project的配置。Terry Kwan，2016-07-10 * */ -@ContextConfiguration(locations={"classpath:spring/*.xml", "classpath:spring/security/*.xml", "classpath:spring/database/sqlserver/*.xml", +@ContextConfiguration(locations={"classpath:spring/*.xml", "classpath:spring/security/*.xml", + // "classpath:spring/database/sqlserver/*.xml", "classpath:spring/projects/gzfdzl/*.xml" }) //@ContextConfiguration(locations={"classpath:applicationContext-test.xml"}) public class AbstractCSSDTest extends @@ -2598,6 +2597,24 @@ vos.add(vo); } + protected void appendToCollection2( + Collection vos, String tousseName, int amount, + String tousseType, String isRecycling, long id, long tousseDefinitionID) { + TousseItemVo vo = new TousseItemVo(); + vo.setId(id); + vo.setTousseName(tousseName); + vo.setTousseType(tousseType); + vo.setAmount(amount); + vo.setIsRecycling(isRecycling); + vo.setTousseDefinitionID(tousseDefinitionID); + if ("一次性物品".equals(tousseType)){ + vo.setDiposable("是"); + } + else{ + vo.setDiposable("否"); + } + vos.add(vo); + } /** * 默认回滚数据 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java =================================================================== diff -u -r14491 -r16699 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 14491) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java (.../TestRecyclingApplication.java) (revision 16699) @@ -1,27 +1,9 @@ package test.forgon.disinfectsystem.application; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.testng.annotations.Test; - -import test.forgon.constant.Constants; -import test.forgon.disinfectsystem.AbstractCSSDTest; - import com.forgon.directory.model.BarcodeDevice; +import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsIdentification; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; @@ -44,7 +26,26 @@ import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; +import org.springframework.beans.factory.annotation.Autowired; +import org.testng.annotations.Test; +import test.forgon.constant.Constants; +import test.forgon.disinfectsystem.AbstractCSSDTest; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; + /** * @author Angus * @@ -65,7 +66,11 @@ private ForeignTousseApplicationManager foreignTousseApplicationManager; @Autowired private SerialNumManager serialNumManager; - + + @Autowired + private DiposableGoodsManager diposableGoodsManager; + + private void initCustomGoods(){ Collection applyItemVos = new ArrayList(); @@ -208,9 +213,14 @@ RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); - + + DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsByName("注射器", "5ML"); + assertNotNull(disposableGoods); + Long id = disposableGoods.getId(); + assertNotNull(id); + Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0,id); recyclingApplicationManager.saveRecyclingApplication( disposableGoodsApplication, @@ -243,10 +253,19 @@ RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, Constants.ORG_UNIT_NAME_OR, Constants.ORG_UNIT_CODE_OR, new Date()); - + + DisposableGoods disposableGoods1 = diposableGoodsManager.getDisposableGoodsByName("注射器", "5ML"); + assertNotNull(disposableGoods1); + Long id1 = disposableGoods1.getId(); + assertNotNull(id1); + DisposableGoods disposableGoods2 = diposableGoodsManager.getDisposableGoodsByName("注射器", "10ML"); + assertNotNull(disposableGoods2); + Long id2 = disposableGoods2.getId(); + assertNotNull(id2); + Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0, id1); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, id2); recyclingApplicationManager.saveRecyclingApplication( disposableGoodsApplication, @@ -295,9 +314,9 @@ Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "灭菌纱块[8*12CM2块/包]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[20ML]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "灭菌纱块[8*12CM2块/包]", 300 , "一次性物品", "否", 0, getDisposeGoodId("灭菌纱块", "8*12CM2块/包")); + appendToCollection2(applyItemVos, "注射器[20ML]", 100 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "20ML")); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); recyclingApplicationManager.saveRecyclingApplication( disposableGoodsApplication, applyItemVos, true); @@ -331,11 +350,12 @@ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "灭菌纱块[8*12CM2块/包]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[20ML]", 100 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "灭菌纱块[8*12CM2块/包]", 300 , "一次性物品", "否", 0, getDisposeGoodId("灭菌纱块", "8*12CM2块/包")); + appendToCollection2(applyItemVos, "注射器[20ML]", 100 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "20ML")); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); + + - // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication = null; try { @@ -376,8 +396,8 @@ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0, getDisposeGoodId("灭菌纱块","6*8CM2块/包（100/盒)")); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication = null; @@ -394,8 +414,8 @@ applyItemVos, true); Collection applyItemVos2 = new ArrayList(); - appendToCollection(applyItemVos2, "一次型使用无菌注射针[6#]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos2, "一次型使用无菌注射针[6#]", 100 , "一次性物品", "否", 0, getDisposeGoodId("一次型使用无菌注射针", "6#")); + appendToCollection2(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0, getDisposeGoodId("一次性使用吸痰管", "12#")); // 创建一次性物品申请单 @@ -428,9 +448,9 @@ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); - + appendToCollection2(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0, getDisposeGoodId("灭菌纱块", "6*8CM2块/包（100/盒)")); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); + // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication = null; try { @@ -446,9 +466,9 @@ applyItemVos, true); Collection applyItemVos2 = new ArrayList(); - appendToCollection(applyItemVos2, "一次型使用无菌注射针[6#]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0); - + appendToCollection2(applyItemVos2, "一次型使用无菌注射针[6#]", 100 , "一次性物品", "否", 0, getDisposeGoodId("一次型使用无菌注射针", "6#")); + appendToCollection2(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0, getDisposeGoodId("一次性使用吸痰管", "12#")); + // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( "Y-0002", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, @@ -475,8 +495,8 @@ } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0, getDisposeGoodId("灭菌纱块", "6*8CM2块/包（100/盒)")); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication = null; try { @@ -493,8 +513,8 @@ Collection applyItemVos2 = new ArrayList(); - appendToCollection(applyItemVos2, "注射器[10ML]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos2, "注射器[10ML]", 100 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); + appendToCollection2(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0, getDisposeGoodId("一次性使用吸痰管", "12#")); // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( @@ -525,8 +545,8 @@ } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "灭菌纱块[6*8CM2块/包（100/盒)]", 300 , "一次性物品", "否", 0, getDisposeGoodId("灭菌纱块", "6*8CM2块/包（100/盒)")); + appendToCollection2(applyItemVos, "注射器[10ML]", 200 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication = null; try { @@ -542,8 +562,8 @@ applyItemVos, true); Collection applyItemVos2 = new ArrayList(); - appendToCollection(applyItemVos2, "注射器[10ML]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos2, "注射器[10ML]", 100 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "10ML")); + appendToCollection2(applyItemVos2, "一次性使用吸痰管[12#]", 40 , "一次性物品", "否", 0, getDisposeGoodId("一次性使用吸痰管", "12#")); // 创建一次性物品申请单 RecyclingApplication disposableGoodsApplication2 = createApplicationByParam( @@ -771,23 +791,22 @@ initCustomGoods(); makeActiveUser("oruser1"); - - + Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "一次性导尿包[12#]", 17 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "一次性压舌板[木质]", 300 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "动脉采血器[2ML]", 9 , "一次性物品", "否", 0); - appendToCollection(applyItemVos, "一次性腰穿包[9#]", 6 , "一次性物品", "否", 0); - + appendToCollection2(applyItemVos, "一次性导尿包[12#]", 17 , "一次性物品", "否", 0, getDisposeGoodId("一次性导尿包","12#")); + appendToCollection2(applyItemVos, "一次性压舌板[木质]", 300 , "一次性物品", "否", 0, getDisposeGoodId("一次性压舌板","木质")); + appendToCollection2(applyItemVos, "动脉采血器[2ML]", 9 , "一次性物品", "否", 0, getDisposeGoodId("动脉采血器","2ML")); + appendToCollection2(applyItemVos, "一次性腰穿包[9#]", 6 , "一次性物品", "否", 0, getDisposeGoodId("一次性腰穿包","9#")); + Collection applyItemVos2 = new ArrayList(); - appendToCollection(applyItemVos2, "灭菌棉球[10粒/包]", 150 , "一次性物品", "否", 0); - appendToCollection(applyItemVos2, "一次性弯盘[单腰A型]", 400 , "一次性物品", "否", 0); - appendToCollection(applyItemVos2, "一次性使用灌肠袋", 30 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos2, "灭菌棉球[10粒/包]", 150 , "一次性物品", "否", 0, getDisposeGoodId("灭菌棉球","10粒/包")); + appendToCollection2(applyItemVos2, "一次性弯盘[单腰A型]", 400 , "一次性物品", "否", 0, getDisposeGoodId("一次性弯盘","单腰A型")); + appendToCollection2(applyItemVos2, "一次性使用灌肠袋", 30 , "一次性物品", "否", 0, getDisposeGoodId("一次性使用灌肠袋","")); Collection applyItemVos3 = new ArrayList(); - appendToCollection(applyItemVos3, "灭菌纱块[6*8CM2块/包（100/盒)]", 200 , "一次性物品", "否", 0); - appendToCollection(applyItemVos3, "一次型使用无菌注射针[6#]", 100 , "一次性物品", "否", 0); - appendToCollection(applyItemVos3, "医用棉签[12CM20支/包]", 40 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos3, "灭菌纱块[6*8CM2块/包（100/盒)]", 200 , "一次性物品", "否", 0,getDisposeGoodId("灭菌纱块","6*8CM2块/包（100/盒)")); + appendToCollection2(applyItemVos3, "一次型使用无菌注射针[6#]", 100 , "一次性物品", "否", 0,getDisposeGoodId("一次型使用无菌注射针","6#")); + appendToCollection2(applyItemVos3, "医用棉签[12CM20支/包]", 40 , "一次性物品", "否", 0,getDisposeGoodId("医用棉签","12CM20支/包")); RecyclingApplication disposableGoodsApplication = createApplicationByParam( "Y-0001", InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, @@ -831,7 +850,21 @@ assertEquals(Constants.ORG_UNIT_CODE_OR,invoicePlan.getSettleAccountsDepartCoding()); assertNotNull(invoicePlan3.getApplicationItems()); } - + + /** + * 根据名字和规格查找对应的一次性物品id + * @param name + * @param spec + * @return + */ + public Long getDisposeGoodId(String name, String spec) { + DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsByName(name, spec); + assertNotNull(disposableGoods); + Long id = disposableGoods.getId(); + assertNotNull(id); + return id; + } + //准备器械包申请单---一张申请单，一种物品 @SuppressWarnings("unchecked") @Test @@ -1276,14 +1309,17 @@ initCSSDData(); makeActiveUser("oruser1"); - String foreignTousseTreeData = "[{tousseItemId:0,tousseDefinitionId:0,tousseName:\"测试外来器械包\",supplierName:\"工商银行\",amount:1,price:0,materials:[0,测试外来器械包材料,5,是]}]"; + // String foreignTousseTreeData = "[{tousseItemId:0,tousseDefinitionId:0,tousseName:\"测试外来器械包\",supplierName:\"工商银行\",amount:1,price:0,materials:[0,\"测试外来器械包材料\",5,\"是\"]}]"; + String foreignTousseTreeData = "[{tousseItemId:0,tousseDefinitionId:0,tousseName:\"测试外来器械包\",supplierName:\"工商银行\",amount:1,price:0," + + "materials:[{materialInstanceId:0,materialName:\"测试外来器械包材料\",amount:5,includeImplant:\"是\",usedAmountOfIncludeImplant:0,minDismantleAmount:0}]}]"; ForeignTousseApplication foreignTousseApplication = new ForeignTousseApplication(); foreignTousseApplication .setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); foreignTousseApplication.setSurgery("开颅术"); foreignTousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); foreignTousseApplication.setSettleAccountsDepart("消毒供应房"); - foreignTousseApplication.setSerialNumber("0100201412020001"); + //流水号生成策略已经改了,所以这个已经没用 + // foreignTousseApplication.setSerialNumber("0100201412020001"); foreignTousseApplication.setSequence(57); foreignTousseApplication.setReaders(";ORGUNIT_8063;"); foreignTousseApplication.setPatient("阿斯达"); @@ -1313,12 +1349,18 @@ foreignTousseApplicationManager.saveOrUpdate( foreignTousseApplication, foreignTousseTreeData, "",""); - String sql = "from " + ForeignTousseApplication.class.getSimpleName() - + " po where po.serialNumber='0100201412020001'"; - List List = objectDao.findByHql(sql); - assertNotNull(List); - assertEquals(1, List.size()); + // String sql = "from " + ForeignTousseApplication.class.getSimpleName() + // + " po where po.serialNumber='0100201412020001'"; + // List List = objectDao.findByHql(sql); + // assertNotNull(List); + // assertEquals(1, List.size()); + //由于流水号生成策略已经修改,所以这里改成用id来查找,新增后foreignTousseApplication会持久化,所以会得到对应的id,这里改成用id来查找 + ForeignTousseApplication foreign = objectDao.getHt().get(ForeignTousseApplication.class, foreignTousseApplication.getId()); + assertNotNull(foreign); + } + + //申请自定义器械包 @SuppressWarnings("unchecked") @@ -1419,7 +1461,7 @@ assertNotNull(application); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "5ML")); recyclingApplicationManager.saveRecyclingApplication(application, applyItemVos, true); @@ -1439,7 +1481,8 @@ vo.setTousseName("注射器[10ML]"); vo.setTousseType("一次性物品"); vo.setAmount(200); - + vo.setTousseDefinitionID(getDisposeGoodId("注射器", "10ML")); + Collection newTousseItemVoList = new ArrayList(); newTousseItemVoList.add(vo); String msg = null; @@ -1465,6 +1508,7 @@ vo2.setTousseName("纱块[6*8]"); vo2.setTousseType("一次性物品"); vo2.setAmount(300); + vo2.setTousseDefinitionID(getDisposeGoodId("纱块", "6*8")); newTousseItemVoList.clear();//事先清空 newTousseItemVoList.add(vo2); try{ @@ -1503,7 +1547,7 @@ assertNotNull(application); Collection applyItemVos = new ArrayList(); - appendToCollection(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0); + appendToCollection2(applyItemVos, "注射器[5ML]", 100 , "一次性物品", "否", 0, getDisposeGoodId("注射器", "5ML")); recyclingApplicationManager.saveRecyclingApplication(application, applyItemVos, true); @@ -1523,6 +1567,7 @@ vo.setTousseName("注射器[10ML]"); vo.setTousseType("一次性物品"); vo.setAmount(200); + vo.setTousseDefinitionID(getDisposeGoodId("注射器", "10ML")); Collection newTousseItemVoList = new ArrayList(); newTousseItemVoList.add(vo); @@ -1550,6 +1595,7 @@ vo2.setTousseName("纱块[6*8]"); vo2.setTousseType("一次性物品"); vo2.setAmount(300); + vo2.setTousseDefinitionID(getDisposeGoodId("纱块", "6*8")); newTousseItemVoList.clear(); newTousseItemVoList.add(vo2); try{