Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java =================================================================== diff -u -r13461 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java (.../RecyclingMaterialsTest.java) (revision 13461) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java (.../RecyclingMaterialsTest.java) (revision 14107) @@ -56,21 +56,23 @@ makeActiveUser("cssduser1"); } - private RecyclingRecord createRecyclingRecord() { + private RecyclingRecord createRecyclingRecord(Map map) { RecyclingApplication application = new RecyclingApplication(); TousseItem ti1 = new TousseItem(); ti1.setTousseName("Test开颅包"); ti1.setAmount(2); ti1.setRecyclingAmount(null); ti1.setSendOutAmount(0); + ti1.setTousseDefinitionId(map.get("Test开颅包")); ti1.setInvoicePlan(application); TousseItem ti2 = new TousseItem(); ti2.setTousseName("Test开口包"); ti2.setAmount(2); ti2.setRecyclingAmount(null); ti2.setSendOutAmount(0); + ti2.setTousseDefinitionId(map.get("Test开口包")); ti2.setInvoicePlan(application); List applicationItems = new ArrayList(); @@ -104,34 +106,35 @@ public void testTousseUnEntirelyCleanForRecyclingRecord(){ prepareData(); @SuppressWarnings("unchecked") - List containerGroup = objectDao.findBySql(Container.class.getSimpleName(), "where po.containerGroup.groupName = 'WB2-001'"); //Test开颅包 - RecyclingRecord record = createRecyclingRecord(); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + Map map = new HashMap(); + map.put("Test开颅包", td_Test开颅包.getId()); + map.put("Test开口包", td_Test开口包.getId()); + RecyclingRecord record = createRecyclingRecord(map); JSONArray jsonArray = new JSONArray(); - TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); - assertNotNull(td); - List msList = td.getMaterialInstances(); - for (MaterialInstance mi : msList) { + + assertNotNull(td_Test开颅包); + String basketBarcodeGroup = "019000001;019000002;019000003;019000004"; + String [] barcodeArray = {"019000001","019000002","019000003","019000004"}; + List msList = td_Test开颅包.getMaterialInstances(); + for (int i = 0; i < msList.size(); i++) { + MaterialInstance mi = msList.get(i); MaterialDefinition md = mi.getMaterialDefinition(); String materialName = md.getName(); String specification = md.getSpecification(); if(StringUtils.isNotBlank(specification)){ materialName += "["+specification+"]"; } - for(Container basket : containerGroup){ - //TODO -// if(basket.getGroupNum().intValue() == mi.getBasketGroupNum().intValue()){ - addRecyclingItem(jsonArray, basket.getBarcode(), "0", materialName,td.getId(), - 2 * mi.getCount(), "材料", "Test开颅包", 2); - break; -// } - } + addRecyclingItem(jsonArray, barcodeArray[i], "0", materialName,td_Test开颅包.getId(), + 2 * mi.getCount(), "材料", "Test开颅包", 2,basketBarcodeGroup); } - TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), - 2, "器械包", "", null); + 2, "器械包", "", null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -172,19 +175,10 @@ TousseItem item2 = appTousseMap.get("Test开口包"); assertEquals(2, item2.getRecyclingAmount().intValue()); - String materialBarcode = ""; - for(Container basket : containerGroup){ - if(StringUtils.isNotBlank(materialBarcode)){ - materialBarcode += ";"; - } - materialBarcode += basket.getBarcode(); - } - TousseDefinition td22 = tousseDefinitionManager.getTousseDefinitionByName("test开颅包"); - TousseDefinition td2 = tousseDefinitionManager.getTousseDefinitionByName("test开口包"); - PackingTask task1 = packingManager.getUnfinishedTask(record.getId(), materialBarcode, - td22.getId(), PackingTask.TASK_RECYCLINGRECORD); + PackingTask task1 = packingManager.getUnfinishedTask(record.getId(), basketBarcodeGroup, + td_Test开颅包.getId(), PackingTask.TASK_RECYCLINGRECORD); PackingTask task2 = packingManager.getUnfinishedTask(record.getId(), "019000001", - td2.getId(), PackingTask.TASK_RECYCLINGRECORD); + td_Test开口包.getId(), PackingTask.TASK_RECYCLINGRECORD); assertEquals(2, task1.getUnPackAmount().intValue()); assertEquals(2, task2.getUnPackAmount().intValue()); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java =================================================================== diff -u -r13461 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java (.../RecyclingRecordManagerTests.java) (revision 13461) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java (.../RecyclingRecordManagerTests.java) (revision 14107) @@ -51,20 +51,27 @@ public void testCreatePackingTasksAfterRecycling() { prepareData(); //生成申请单、回收记录 - RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); - JSONArray jsonArray = new JSONArray(); TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + TousseDefinition td_Test治疗巾 = tousseDefinitionManager.getTousseDefinitionByName("Test治疗巾"); + Map map = new HashMap(); + map.put("Test开胸包", td_Test开胸包.getId()); + map.put("Test开颅包", td_Test开颅包.getId()); + map.put("Test开口包", td_Test开口包.getId()); + map.put("Test穿刺包", td_Test穿刺包.getId()); + map.put("Test治疗巾", td_Test治疗巾.getId()); + RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(map); + JSONArray jsonArray = new JSONArray(); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -187,9 +194,9 @@ JSONArray jsonArray2 = new JSONArray(); addRecyclingItem(jsonArray2, "019000001", basketId, "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", - null); + null, "019000001"); addRecyclingItem(jsonArray2, "019000001", basketId, "Test开颅包",td_Test开颅包.getId(), 3, "器械包", "", - null); + null, "019000001"); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); @@ -245,9 +252,9 @@ //---------再次编辑回收记录,把回收数量改为小于已发货数量是否能够保存---------// JSONArray jsonArray3 = new JSONArray(); addRecyclingItem(jsonArray3, "019000001", basketId, "Test开口包",td_Test开口包.getId(), -1, "器械包", "", - null); + null, "019000001"); addRecyclingItem(jsonArray3, "019000001", basketId, "Test穿刺包",td_Test穿刺包.getId(), -1, "器械包", "", - null); + null, "019000001"); JSONObject params3 = new JSONObject(); params3.put("tousseJson", jsonArray3); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java =================================================================== diff -u -r13300 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java (.../TousseIntoBasketRestrictionsTests.java) (revision 13300) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java (.../TousseIntoBasketRestrictionsTests.java) (revision 14107) @@ -60,9 +60,9 @@ @Test public void testTousseIntoBasketAmount(){ prepareData(); - + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); //空篮筐 - String params = "{tousseName:'Test开胸包',tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[{name:'Test开口包',type:'器械包',amount:5}],goodsInfo:[{name:'Test开胸包'}]}]}"; + String params = "{tousseName:'Test开胸包',tousseDefinitionID:"+td_Test开胸包.getId()+",tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[{name:'Test开口包',type:'器械包',amount:5}],goodsInfo:[{name:'Test开胸包'}]}]}"; String result = recyclingRecordManager.getTousseIntoBasketAmount(params); assertNotNull(result); JSONObject obj = JSONObject.fromObject(result); @@ -92,7 +92,7 @@ ObjectDao.save(basket); //篮筐内已经放入物品占80%体积，继续放60%的东西 - String params2 = "{tousseName:'Test开胸包',tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[{name:'Test开胸包',type:'器械包',amount:1},{name:'Test开口包',type:'器械包',amount:3}],goodsInfo:[{name:'Test开胸包'}]}]}"; + String params2 = "{tousseName:'Test开胸包',tousseDefinitionID:"+td_Test开胸包.getId()+",tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[{name:'Test开胸包',type:'器械包',amount:1},{name:'Test开口包',type:'器械包',amount:3}],goodsInfo:[{name:'Test开胸包'}]}]}"; String result2 = recyclingRecordManager.getTousseIntoBasketAmount(params2); assertNotNull(result2); JSONObject obj2 = JSONObject.fromObject(result2); @@ -110,13 +110,13 @@ ObjectDao.saveOrUpdate(basket2); //篮筐已满是否还能继续放东西 - String params3 = "{tousseName:'Test开胸包',tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[{name:'Test开口包',type:'器械包',amount:3}],goodsInfo:[{name:'Test开胸包'}]}]}"; + String params3 = "{tousseName:'Test开胸包',tousseDefinitionID:"+td_Test开胸包.getId()+",tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[{name:'Test开口包',type:'器械包',amount:3}],goodsInfo:[{name:'Test开胸包'}]}]}"; String result3 = recyclingRecordManager.getTousseIntoBasketAmount(params3); assertNotNull(result3); JSONObject obj3 = JSONObject.fromObject(result3); assertEquals(0, obj3.optInt("loadedAmount")); - String params4 = "{tousseName:'Test开口包',tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'Test开口包'}]}]}"; + String params4 = "{tousseName:'Test开口包',tousseDefinitionID:"+ td2 .getId()+",tousseAmount:3,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'Test开口包'}]}]}"; String result4 = recyclingRecordManager.getTousseIntoBasketAmount(params4); assertNotNull(result4); JSONObject obj4 = JSONObject.fromObject(result4); @@ -140,15 +140,16 @@ public void testMaterialIntoBasket(){ prepareData(); //当前发的物品占篮筐体积 1号篮筐 0.35 2号篮筐 0.3 - String params = "{tousseName:'Test开颅包',tousseAmount:3,isCleanedEntirely:'否',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'Test钳子'},{name:'Test棉球'}]},{barcode:'019000002',scanedGoods:[],goodsInfo:[{name:'Test胆道探条'},{name:'Test静脉拉钩'}]}]}"; + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + String params = "{tousseName:'Test开颅包',tousseDefinitionID:"+td_Test开颅包.getId()+",tousseAmount:3,isCleanedEntirely:'否',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'Test钳子'},{name:'Test棉球'}]},{barcode:'019000002',scanedGoods:[],goodsInfo:[{name:'Test胆道探条'},{name:'Test静脉拉钩'}]}]}"; String result = recyclingRecordManager.getTousseIntoBasketAmount(params); assertNotNull(result); JSONObject obj = JSONObject.fromObject(result); assertEquals(3, obj.optInt("loadedAmount")); setDBClassifyBasket(); //再次入筐后体积 1号篮筐 1.2834 2号篮筐 1.1 所以物品只能入筐5个;入五个后：1号篮筐体积：0.9333,2号筐：0.8 - String params2 = "{tousseName:'Test开颅包',tousseAmount:8,isCleanedEntirely:'否',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'Test钳子'},{name:'Test棉球'}]},{barcode:'019000002',scanedGoods:[],goodsInfo:[{name:'Test胆道探条'},{name:'Test静脉拉钩'}]}]}"; + String params2 = "{tousseName:'Test开颅包',tousseDefinitionID:"+td_Test开颅包.getId()+",tousseAmount:8,isCleanedEntirely:'否',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'Test钳子'},{name:'Test棉球'}]},{barcode:'019000002',scanedGoods:[],goodsInfo:[{name:'Test胆道探条'},{name:'Test静脉拉钩'}]}]}"; String result2 = recyclingRecordManager.getTousseIntoBasketAmount(params2); assertNotNull(result2); JSONObject obj2 = JSONObject.fromObject(result2); @@ -162,7 +163,7 @@ td.setIntoBasketMaxAmount(60); objectDao.saveOrUpdate(td); //0.0667 - String params3 = "{tousseName:'腰椎穿刺包',tousseAmount:4,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'腰椎穿刺包'}]}]}"; + String params3 = "{tousseName:'腰椎穿刺包',tousseDefinitionID:"+td.getId()+",tousseAmount:4,isCleanedEntirely:'是',data:[{barcode:'019000001',scanedGoods:[],goodsInfo:[{name:'腰椎穿刺包'}]}]}"; String result3 = recyclingRecordManager.getTousseIntoBasketAmount(params3); assertNotNull(result3); JSONObject obj3 = JSONObject.fromObject(result3); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r14104 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 14104) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 14107) @@ -1839,14 +1839,15 @@ * 创建申请单回收记录 * @return */ - public RecyclingRecord createApplicationAndRecyclingRecordData() { + public RecyclingRecord createApplicationAndRecyclingRecordData(Map map) { RecyclingApplication application = new RecyclingApplication(); TousseItem ti1 = new TousseItem(); ti1.setTousseName("Test开胸包"); ti1.setIsRecycling("是"); ti1.setAmount(5); ti1.setRecyclingAmount(null); ti1.setSendOutAmount(0); + ti1.setTousseDefinitionId(map.get("Test开胸包")); ti1.setInvoicePlan(application); TousseItem ti2 = new TousseItem(); @@ -1855,6 +1856,7 @@ ti2.setAmount(5); ti2.setRecyclingAmount(null); ti2.setSendOutAmount(0); + ti2.setTousseDefinitionId(map.get("Test开颅包")); ti2.setInvoicePlan(application); TousseItem ti3 = new TousseItem(); @@ -1863,6 +1865,7 @@ ti3.setAmount(5); ti3.setRecyclingAmount(null); ti3.setSendOutAmount(0); + ti3.setTousseDefinitionId(map.get("Test开口包")); ti3.setInvoicePlan(application); TousseItem ti4 = new TousseItem(); @@ -1871,6 +1874,7 @@ ti4.setIsRecycling("是"); ti4.setRecyclingAmount(null); ti4.setSendOutAmount(0); + ti4.setTousseDefinitionId(map.get("Test穿刺包")); ti4.setInvoicePlan(application); TousseItem ti5 = new TousseItem(); @@ -1879,6 +1883,7 @@ ti1.setIsRecycling("否"); ti5.setRecyclingAmount(null); ti5.setSendOutAmount(0); + ti5.setTousseDefinitionId(map.get("Test治疗巾")); ti5.setInvoicePlan(application); List applicationItems = new ArrayList(); @@ -2533,14 +2538,14 @@ public void addRecyclingItem(JSONArray jsonArray, String basketBarcode, String basketId, String tousseName,Long tousseDefinitionID, Integer amount, String itemType, String tousseNameForMaterial, - Integer tousseAmountForMaterial) { - addRecyclingItem(jsonArray, basketBarcode, basketId, tousseName,tousseDefinitionID, amount, itemType, tousseNameForMaterial, tousseAmountForMaterial, null); + Integer tousseAmountForMaterial,String basketGroupBarcodes) { + addRecyclingItem(jsonArray, basketBarcode, basketId, tousseName,tousseDefinitionID, amount, itemType, tousseNameForMaterial, tousseAmountForMaterial, null,basketGroupBarcodes); } public void addRecyclingItem(JSONArray jsonArray, String basketBarcode, String basketId, String tousseName,Long tousseDefinitionID, Integer amount, String itemType, String tousseNameForMaterial, - Integer tousseAmountForMaterial,Long appid) { + Integer tousseAmountForMaterial,Long appid,String basketGroupBarcodes) { JSONObject obj = new JSONObject(); obj.put("basketBarcode", basketBarcode); obj.put("basketId", basketId); @@ -2551,6 +2556,7 @@ obj.put("tousseNameForMaterial", tousseNameForMaterial); obj.put("tousseAmountForMaterial", tousseAmountForMaterial); obj.put("appid", appid); + obj.put("basketGroupBarcodes", basketGroupBarcodes); jsonArray.add(obj); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java =================================================================== diff -u -r13461 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 13461) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 14107) @@ -75,9 +75,9 @@ TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("止血带"); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "止血带",td_止血带.getId(), 1, "消毒物品", "", - null,appId); + null,appId,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -176,7 +176,7 @@ JSONArray jsonArray2 = new JSONArray(); String basketId = record.getClassifyBaskets().get(0).getId().toString(); addRecyclingItem(jsonArray2, "019000001", basketId, "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); @@ -216,7 +216,7 @@ /******* 删除一种器械包 *******/ JSONArray jsonArray3 = new JSONArray(); addRecyclingItem(jsonArray3, "019000001", basketId, "Test开胸包",td_Test开胸包.getId(), -7, "器械包", "", - null); + null,"019000001"); JSONObject params3 = new JSONObject(); params3.put("tousseJson", jsonArray3); params3.put("errors",""); @@ -260,7 +260,7 @@ TousseDefinition td4 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); JSONArray jsonArray4 = new JSONArray(); addRecyclingItem(jsonArray4, "019000001", basketId, "Test开颅包",td4.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params4 = new JSONObject(); params4.put("tousseJson", jsonArray4); params4.put("errors",""); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java =================================================================== diff -u -r13461 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 13461) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 14107) @@ -52,26 +52,34 @@ public void testDeleteForAddRecylingRecord(){ prepareData(); //Test开胸包 -5;Test开颅包 -5;Test开口包 -2;Test穿刺包 -2 - RecyclingRecord record = createApplicationAndRecyclingRecordData(); - JSONArray jsonArray = new JSONArray(); TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + TousseDefinition td_Test治疗巾 = tousseDefinitionManager.getTousseDefinitionByName("Test治疗巾"); + Map map = new HashMap(); + map.put("Test开胸包", td_Test开胸包.getId()); + map.put("Test开颅包", td_Test开颅包.getId()); + map.put("Test开口包", td_Test开口包.getId()); + map.put("Test穿刺包", td_Test穿刺包.getId()); + map.put("Test治疗巾", td_Test治疗巾.getId()); + RecyclingRecord record = createApplicationAndRecyclingRecordData(map); + + JSONArray jsonArray = new JSONArray(); + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", - null); - addRecyclingItem(jsonArray, "", "0", "Test开胸包",td_Test开胸包.getId(), -5, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); params.put("errors",""); params.put("damages",""); + params.put("delToussItems", JSONArray.fromObject("[{tousseDefinitionID:"+td_Test开胸包.getId()+"}]")); try { recyclingRecordManager.saveOrUpdate(record,params); } catch (RecyclingRecordException e1) { @@ -88,6 +96,7 @@ appTousseMap.put(tousseItem.getTousseName(), tousseItem); } TousseItem tousseItem = appTousseMap.get("Test开胸包"); + assertNotNull(tousseItem); assertEquals(0, tousseItem.getRecyclingAmount().intValue()); assertEquals(5, tousseItem.getAmount().intValue()); @@ -133,21 +142,30 @@ public void testDeleteForEditRecyclingRecord(){ prepareData(); //Test开胸包 -5;Test开颅包 -5;Test开口包 -2;Test穿刺包 -2 - RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); - - JSONArray jsonArray = new JSONArray(); + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + TousseDefinition td_Test治疗巾 = tousseDefinitionManager.getTousseDefinitionByName("Test治疗巾"); + Map map = new HashMap(); + map.put("Test开胸包", td_Test开胸包.getId()); + map.put("Test开颅包", td_Test开颅包.getId()); + map.put("Test开口包", td_Test开口包.getId()); + map.put("Test穿刺包", td_Test穿刺包.getId()); + map.put("Test治疗巾", td_Test治疗巾.getId()); + + RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(map); + + JSONArray jsonArray = new JSONArray(); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -167,7 +185,7 @@ String basketid = baskets.get(0).getId().toString(); JSONArray jsonArray2 = new JSONArray(); addRecyclingItem(jsonArray2, "019000001", basketid, "Test开胸包",td_Test开胸包.getId(), -5, "器械包", "", - null); + null,"019000001"); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); @@ -232,21 +250,28 @@ public void testDeleteRecylingItemAfterPacking(){ prepareData(); //Test开胸包 -5;Test开颅包 -5;Test开口包 -2;Test穿刺包 -2 - RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); - - JSONArray jsonArray = new JSONArray(); TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + TousseDefinition td_Test治疗巾 = tousseDefinitionManager.getTousseDefinitionByName("Test治疗巾"); + Map map = new HashMap(); + map.put("Test开胸包", td_Test开胸包.getId()); + map.put("Test开颅包", td_Test开颅包.getId()); + map.put("Test开口包", td_Test开口包.getId()); + map.put("Test穿刺包", td_Test穿刺包.getId()); + map.put("Test治疗巾", td_Test治疗巾.getId()); + RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(map); + + JSONArray jsonArray = new JSONArray(); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -270,11 +295,12 @@ String basketid = baskets.get(0).getId().toString(); JSONArray jsonArray2 = new JSONArray(); addRecyclingItem(jsonArray2, "019000001", basketid, "Test开胸包",td_Test开胸包.getId(), -5, "器械包", "", - null); + null,"019000001"); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); params2.put("damages",""); + params2.put("delToussItems", JSONArray.fromObject("[{tousseDefinitionID:"+td_Test开胸包.getId()+"}]")); String msg = null; try { recyclingRecordManager.saveOrUpdate(recyclingRecord, params2); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java =================================================================== diff -u -r13045 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java (.../AddRecyclingRecordTests.java) (revision 13045) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java (.../AddRecyclingRecordTests.java) (revision 14107) @@ -61,11 +61,11 @@ TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 1, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "test止血带[20条/扎]",td_test止血带.getId(), 5, "材料", "test止血带", - 5); + 5,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); params.put("errors",""); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java =================================================================== diff -u -r13683 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java (.../UnPackingDisinfectGoodsInstanceTests.java) (revision 13683) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java (.../UnPackingDisinfectGoodsInstanceTests.java) (revision 14107) @@ -102,37 +102,42 @@ } private void initData(){ - cleanAll(); - initDirectoryInfo(); - initBaseData(); - initMaterialAndTousseData(); - makeActiveUser("cssduser1"); + initCSSDData(); newDisinfectionGoodsDefinition(); + makeActiveUser("cssduser1"); } public RecyclingApplication newRecyclingApplication(){ + TousseDefinition td1 = tousseDefinitionManager.getTousseDefinitionByName("湿化瓶(小口)"); + TousseDefinition td2 = tousseDefinitionManager.getTousseDefinitionByName("雾化器(小口)"); RecyclingApplication application = new RecyclingApplication(); application.setType(InvoicePlan.TYPE_COMBO_FORM); - application.setDepart("测试内科"); + application.setDepart("测试内科仓库1"); application.setDepartCoding("testNeike"); - application.setSettleAccountsDepart("测试内科"); + application.setSettleAccountsDepart("测试内科仓库1"); application.setSettleAccountsDepartCoding("testNeike"); application.setSerialNumber("010000001"); application.setApplicant("张三"); + application.setHandleDepartCoding(Constants.ORG_UNIT_CODE_DISINFECT); + application.setHandleDepart(Constants.ORG_UNIT_NAME_CSSD); List items = new ArrayList(); TousseItemVo vo = new TousseItemVo(); vo.setId(0L); vo.setTousseName("湿化瓶(小口)"); vo.setAmount(2); vo.setDiposable("否"); + vo.setTousseDefinitionId(td1.getId()); + vo.setTousseDefinitionID(td1.getId()); vo.setTousseType("消毒物品"); TousseItemVo vo2 = new TousseItemVo(); vo2.setId(0L); vo2.setTousseName("雾化器(小口)"); vo2.setAmount(3); vo2.setDiposable("否"); + vo2.setTousseDefinitionId(td2.getId()); + vo2.setTousseDefinitionID(td2.getId()); vo2.setTousseType("消毒物品"); items.add(vo); @@ -150,9 +155,11 @@ public void test1(){ initData(); RecyclingApplication application = newRecyclingApplication(); - List tis = tousseInstanceManager.getTousseInstanceBySql(" where tousseName = '雾化器(小口)_" + application.getId() + "'"); + String sql = String.format("where po.tousseName='%s' and po.invoicePlanID=%s", "雾化器(小口)",application.getId()); + List tis = tousseInstanceManager.getTousseInstanceBySql(sql); assertEquals(tis.size(), 3); - List tis2 = tousseInstanceManager.getTousseInstanceBySql(" where tousseName = '湿化瓶(小口)_" + application.getId() + "'"); + String sql2 = String.format("where po.tousseName='%s' and po.invoicePlanID=%s", "湿化瓶(小口)",application.getId()); + List tis2 = tousseInstanceManager.getTousseInstanceBySql(sql2); assertEquals(tis2.size(), 2); RecyclingRecord recyclingRecord = new RecyclingRecord(); @@ -165,27 +172,30 @@ params.put("confirmation", false); params.put("damages", ""); params.put("errors", ""); - + TousseDefinition td_湿化瓶小口 = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID("湿化瓶(小口)", "消毒物品", ""+application.getId()); JSONArray array = new JSONArray(); JSONObject obj = new JSONObject(); obj.put("basketBarcode", "019000001"); obj.put("basketId", 0); - obj.put("tousseName", "湿化瓶(小口)_"+application.getId()); + obj.put("tousseName", "湿化瓶(小口)"); + obj.put("tousseDefinitionID", td_湿化瓶小口.getId()); obj.put("amount", 2); obj.put("itemType", "器械包"); obj.put("tousseNameForMaterial", ""); obj.put("idCardBarcode", ""); obj.put("tousseAmountForMaterial", 0); + obj.put("basketGroupBarcodes", "019000001"); array.add(obj); params.put("tousseJson", array); recyclingRecordManager.saveOrUpdate(recyclingRecord, params); - - List tis3 = tousseInstanceManager.getTousseInstanceBySql(" where tousseName = '雾化器(小口)_" + application.getId() + "'"); + String sql3 = String.format("where po.tousseName='%s' and po.invoicePlanID=%s", "雾化器(小口)",application.getId()); + List tis3 = tousseInstanceManager.getTousseInstanceBySql(sql3); assertEquals(tis3.size(), 3); - List tis4 = tousseInstanceManager.getTousseInstanceBySql(" where tousseName = '湿化瓶(小口)_" + application.getId() + "'"); + String sql4 = String.format("where po.tousseName='%s' and po.invoicePlanID=%s", "湿化瓶(小口)",application.getId()); + List tis4 = tousseInstanceManager.getTousseInstanceBySql(sql4); assertEquals(tis4.size(), 2); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java =================================================================== diff -u -r13461 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java (.../RecyclingBasketTests.java) (revision 13461) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java (.../RecyclingBasketTests.java) (revision 14107) @@ -91,7 +91,7 @@ TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); addRecyclingItem(jsonArray, "019000001", ""+basket.getId(), "Test穿刺包",td_Test穿刺包.getId(), 4, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); params.put("errors",""); @@ -140,9 +140,9 @@ TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); params.put("errors",""); @@ -227,11 +227,11 @@ TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000002", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); params.put("errors",""); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java =================================================================== diff -u -r13461 -r14107 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java (.../AddRecyclingItemsForRecyclingRecord.java) (revision 13461) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java (.../AddRecyclingItemsForRecyclingRecord.java) (revision 14107) @@ -42,11 +42,12 @@ makeActiveUser("cssduser1"); } - private RecyclingRecord createRecyclingRecord() { + private RecyclingRecord createRecyclingRecord(Long tousseDefinitionId) { RecyclingApplication application = new RecyclingApplication(); TousseItem ti1 = new TousseItem(); ti1.setTousseName("Test开胸包"); ti1.setAmount(5); + ti1.setTousseDefinitionId(tousseDefinitionId); ti1.setRecyclingAmount(null); ti1.setSendOutAmount(0); ti1.setInvoicePlan(application); @@ -73,15 +74,15 @@ public void testAddRecyclingItemForRecyclingRecord(){ prepareData(); - RecyclingRecord record = createRecyclingRecord(); + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + RecyclingRecord record = createRecyclingRecord(td_Test开胸包.getId()); JSONArray jsonArray = new JSONArray(); - TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -152,21 +153,28 @@ @Test public void testEditRecyclingRecordAddRecyclingItem(){ prepareData(); - RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); - - JSONArray jsonArray = new JSONArray(); TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + TousseDefinition td_Test治疗巾 = tousseDefinitionManager.getTousseDefinitionByName("Test治疗巾"); + Map map = new HashMap(); + map.put("Test开胸包", td_Test开胸包.getId()); + map.put("Test开颅包", td_Test开颅包.getId()); + map.put("Test开口包", td_Test开口包.getId()); + map.put("Test穿刺包", td_Test穿刺包.getId()); + map.put("Test治疗巾", td_Test治疗巾.getId()); + RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(map); + + JSONArray jsonArray = new JSONArray(); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", - null); + null,"019000001"); addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", - null); + null,"019000001"); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -185,7 +193,7 @@ Long basketId = baskets.get(0).getId(); TousseDefinition td_Test缝合包 = tousseDefinitionManager.getTousseDefinitionByName("Test缝合包"); addRecyclingItem(jsonArray2, "019000001", ""+basketId, "Test缝合包",td_Test缝合包.getId(), 2, "器械包", "", - null); + null,"019000001"); params2.put("tousseJson", jsonArray2); params2.put("errors",""); params2.put("damages","");