Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java =================================================================== diff -u -r12332 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java (.../AddRecyclingRecordTests.java) (revision 12332) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java (.../AddRecyclingRecordTests.java) (revision 12339) @@ -18,6 +18,7 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; @@ -54,11 +55,15 @@ record.setRecyclingUser("张雄"); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 2, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包", 1, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 1, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "test止血带[20条/扎]", 5, "材料", "test止血带", + addRecyclingItem(jsonArray, "019000001", "0", "test止血带[20条/扎]",td_test止血带.getId(), 5, "材料", "test止血带", 5); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r12331 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 12339) @@ -118,7 +118,8 @@ record1.setRecyclingUser("张雄"); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "呼吸机", 5, "器械包", "呼吸机", + TousseDefinition td_呼吸机 = tousseDefinitionManager.getTousseDefinitionByName("呼吸机"); + addRecyclingItem(jsonArray, "019000001", "0", "呼吸机",td_呼吸机.getId(), 5, "器械包", "呼吸机", 5); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -190,7 +191,7 @@ record2.setRecyclingUser("张雄"); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", "0", "呼吸机", 3, "器械包", "呼吸机", + addRecyclingItem(jsonArray2, "019000001", "0", "呼吸机",td_呼吸机.getId(), 3, "器械包", "呼吸机", 5); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); @@ -326,7 +327,8 @@ record1.setRecyclingUser("张雄"); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "Test开胸包", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "Test开胸包", 5); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -398,7 +400,7 @@ record2.setRecyclingUser("张雄"); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包", 3, "器械包", "Test开胸包", + addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "Test开胸包", 5); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java =================================================================== diff -u -r12331 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java (.../RecyclingRecordManagerTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java (.../RecyclingRecordManagerTests.java) (revision 12339) @@ -53,13 +53,17 @@ //生成申请单、回收记录 RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包", 5, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); @@ -180,9 +184,9 @@ assertTrue(baskets.size() == 1); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", basketId, "Test开胸包", 3, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", basketId, "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", null); - addRecyclingItem(jsonArray2, "019000001", basketId, "Test开颅包", 3, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", basketId, "Test开颅包",td_Test开颅包.getId(), 3, "器械包", "", null); JSONObject params2 = new JSONObject(); @@ -239,9 +243,9 @@ //---------再次编辑回收记录,把回收数量改为小于已发货数量是否能够保存---------// JSONArray jsonArray3 = new JSONArray(); - addRecyclingItem(jsonArray3, "019000001", basketId, "Test开口包", -1, "器械包", "", + addRecyclingItem(jsonArray3, "019000001", basketId, "Test开口包",td_Test开口包.getId(), -1, "器械包", "", null); - addRecyclingItem(jsonArray3, "019000001", basketId, "Test穿刺包", -1, "器械包", "", + addRecyclingItem(jsonArray3, "019000001", basketId, "Test穿刺包",td_Test穿刺包.getId(), -1, "器械包", "", null); JSONObject params3 = new JSONObject(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java =================================================================== diff -u -r12335 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java (.../PackingTaskTests.java) (revision 12335) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java (.../PackingTaskTests.java) (revision 12339) @@ -122,7 +122,8 @@ RecyclingRecord record = new RecyclingRecord(); record.setRecyclingApplication(applist.get(0)); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); JSONObject params = new JSONObject(); @@ -139,7 +140,7 @@ record1.setRecyclingApplication(applist.get(1)); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包", 3, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", null); JSONObject params2 = new JSONObject(); @@ -173,7 +174,8 @@ RecyclingRecord record = new RecyclingRecord(); record.setRecyclingApplication(applist.get(0)); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); JSONObject params = new JSONObject(); @@ -192,7 +194,7 @@ packingManager.delete(task); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包", 3, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", null); JSONObject params2 = new JSONObject(); @@ -216,7 +218,7 @@ ////////////////////////////编辑回收记录,减少回收数量 String msg3 = ""; JSONArray jsonArray3 = new JSONArray(); - addRecyclingItem(jsonArray3, "019000001", "0", "Test开胸包", -2, "器械包", "", + addRecyclingItem(jsonArray3, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), -2, "器械包", "", null); JSONObject params3 = new JSONObject(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java =================================================================== diff -u -r12331 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java (.../AddRecyclingItemsForRecyclingRecord.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java (.../AddRecyclingItemsForRecyclingRecord.java) (revision 12339) @@ -1,5 +1,5 @@ package test.forgon.disinfectsystem.recyclingrecord.service; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.HashMap; @@ -15,6 +15,7 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; @@ -75,9 +76,11 @@ RecyclingRecord record = createRecyclingRecord(); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); @@ -149,13 +152,17 @@ RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包", 5, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); @@ -173,7 +180,8 @@ JSONObject params2 = new JSONObject(); List baskets = recyclingRecord.getClassifyBaskets(); Long basketId = baskets.get(0).getId(); - addRecyclingItem(jsonArray2, "019000001", ""+basketId, "Test缝合包", 2, "器械包", "", + TousseDefinition td_Test缝合包 = tousseDefinitionManager.getTousseDefinitionByName("Test缝合包"); + addRecyclingItem(jsonArray2, "019000001", ""+basketId, "Test缝合包",td_Test缝合包.getId(), 2, "器械包", "", null); params2.put("tousseJson", jsonArray2); params2.put("errors",""); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r12335 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 12335) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 12339) @@ -261,7 +261,7 @@ tousseDefinition.setHandlerDepartCode("900202"); tousseDefinition.setHandlerDepartName("供应室"); tousseDefinition.getMaterialInstances().add(materialInstance); - + tousseDefinition.setForDisplay(true); objectDao.saveOrUpdate(materialInstance); tousseDefinitionManager.saveOrUpdate(tousseDefinition); @@ -349,6 +349,7 @@ tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); tousseDefinition2.setHandlerDepartCode("900202"); tousseDefinition2.setHandlerDepartName("供应室"); + tousseDefinition2.setForDisplay(true); tousseDefinitionManager.saveOrUpdate(tousseDefinition2); objectDao.saveOrUpdate(materialInstance2); @@ -379,7 +380,7 @@ tousseDefinition3.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); tousseDefinition3.setHandlerDepartCode("900202"); tousseDefinition3.setHandlerDepartName("供应室"); - + tousseDefinition3.setForDisplay(true); tousseDefinitionManager.saveOrUpdate(tousseDefinition3); objectDao.saveOrUpdate(materialInstance3); @@ -1508,13 +1509,17 @@ long appId = application.getId(); + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("止血带"); + TousseItem ti1 = new TousseItem(); ti1.setTousseName("Test开胸包"); ti1.setAmount(5); ti1.setRecyclingAmount(null); ti1.setSendOutAmount(0); ti1.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); ti1.setInvoicePlan(application); + ti1.setTousseDefinitionId(td_Test开胸包.getId()); TousseItem ti2 = new TousseItem(); ti2.setTousseName("Test治疗巾"); @@ -1540,7 +1545,8 @@ ti4.setRecyclingAmount(null); ti4.setSendOutAmount(0); ti4.setInvoicePlan(application); - + ti4.setTousseDefinitionId(td_止血带.getId()); + List applicationItems = new ArrayList(); applicationItems.add(ti1); applicationItems.add(ti2); @@ -2213,20 +2219,21 @@ } public void addRecyclingItem(JSONArray jsonArray, String basketBarcode, - String basketId, String tousseName, Integer amount, + String basketId, String tousseName,Long tousseDefinitionID, Integer amount, String itemType, String tousseNameForMaterial, Integer tousseAmountForMaterial) { - addRecyclingItem(jsonArray, basketBarcode, basketId, tousseName, amount, itemType, tousseNameForMaterial, tousseAmountForMaterial, null); + addRecyclingItem(jsonArray, basketBarcode, basketId, tousseName,tousseDefinitionID, amount, itemType, tousseNameForMaterial, tousseAmountForMaterial, null); } public void addRecyclingItem(JSONArray jsonArray, String basketBarcode, - String basketId, String tousseName, Integer amount, + String basketId, String tousseName,Long tousseDefinitionID, Integer amount, String itemType, String tousseNameForMaterial, Integer tousseAmountForMaterial,Long appid) { JSONObject obj = new JSONObject(); obj.put("basketBarcode", basketBarcode); obj.put("basketId", basketId); obj.put("tousseName", tousseName); + obj.put("tousseDefinitionID", tousseDefinitionID); obj.put("amount", amount); obj.put("itemType", itemType); obj.put("tousseNameForMaterial", tousseNameForMaterial); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java =================================================================== diff -u -r12331 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java (.../RecyclingBasketTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java (.../RecyclingBasketTests.java) (revision 12339) @@ -18,6 +18,7 @@ import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; @@ -85,7 +86,11 @@ recyclingBasketVo.setBasketName(container.getContainerName()); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", ""+basket.getId(), "Test穿刺包", 4, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", ""+basket.getId(), "Test穿刺包",td_Test穿刺包.getId(), 4, "器械包", "", null); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -130,9 +135,13 @@ record.setRecyclingApplication(application); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); @@ -213,11 +222,15 @@ record.setRecyclingApplication(application); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 2, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000002", "0", "Test开胸包", 3, "器械包", "", + addRecyclingItem(jsonArray, "019000002", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", null); JSONObject params = new JSONObject(); params.put("tousseJson", jsonArray); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java =================================================================== diff -u -r12331 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java (.../RecyclingMaterialsTest.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java (.../RecyclingMaterialsTest.java) (revision 12339) @@ -150,14 +150,15 @@ } for(Container basket : containerGroup){ if(basket.getGroupNum().intValue() == mi.getBasketGroupNum().intValue()){ - addRecyclingItem(jsonArray, basket.getBarcode(), "0", materialName, + addRecyclingItem(jsonArray, basket.getBarcode(), "0", materialName,td.getId(), 2 * mi.getCount(), "材料", "Test开颅包", 2); break; } } } - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java =================================================================== diff -u -r12331 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 12339) @@ -55,13 +55,17 @@ RecyclingRecord record = createApplicationAndRecyclingRecordData(); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "", "0", "Test开胸包", -5, "器械包", "", + addRecyclingItem(jsonArray, "", "0", "Test开胸包",td_Test开胸包.getId(), -5, "器械包", "", null); JSONObject params = new JSONObject(); @@ -130,13 +134,17 @@ RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包", 5, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); @@ -156,7 +164,7 @@ assertTrue(baskets.size() == 1); String basketid = baskets.get(0).getId().toString(); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", basketid, "Test开胸包", -5, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", basketid, "Test开胸包",td_Test开胸包.getId(), -5, "器械包", "", null); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); @@ -224,13 +232,17 @@ RecyclingRecord recyclingRecord = createApplicationAndRecyclingRecordData(); JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_Test穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包", 5, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开颅包",td_Test开颅包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test开口包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test开口包",td_Test开口包.getId(), 2, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包", 2, "器械包", "", + addRecyclingItem(jsonArray, "019000001", "0", "Test穿刺包",td_Test穿刺包.getId(), 2, "器械包", "", null); JSONObject params = new JSONObject(); @@ -254,7 +266,7 @@ assertTrue(baskets.size() == 1); String basketid = baskets.get(0).getId().toString(); JSONArray jsonArray2 = new JSONArray(); - addRecyclingItem(jsonArray2, "019000001", basketid, "Test开胸包", -5, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", basketid, "Test开胸包",td_Test开胸包.getId(), -5, "器械包", "", null); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java =================================================================== diff -u -r12335 -r12339 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 12335) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 12339) @@ -49,32 +49,38 @@ @Test public void testCreatePackingTasksAfterRecycling() { prepareData(); - //生成申请单、回收记录 - RecyclingRecord recyclingRecord = createComboApplicationAndRecyclingRecord(); - - RecyclingApplication app = recyclingRecord.getRecyclingApplication(); - assertNotNull(app); - - long appId = app.getId(); - - //创建消毒物品 TousseDefinition disinfectionTousse = new TousseDefinition(); disinfectionTousse.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); disinfectionTousse.setIsTraceable("否"); disinfectionTousse.setName("止血带"); - disinfectionTousse.setInvoicePlanID(appId); +// disinfectionTousse.setInvoicePlanID(appId); disinfectionTousse.setPrice(2.5); disinfectionTousse.setForDisplay(false); disinfectionTousse.setIsCleanedEntirely("否"); disinfectionTousse.setIsRecycling(TousseDefinition.STR_YES); + disinfectionTousse.setForDisplay(true); objectDao.save(disinfectionTousse); + //生成申请单、回收记录 + RecyclingRecord recyclingRecord = createComboApplicationAndRecyclingRecord(); + RecyclingApplication app = recyclingRecord.getRecyclingApplication(); + assertNotNull(app); + long appId = app.getId(); + + + + + JSONArray jsonArray = new JSONArray(); - addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包", 5, "器械包", "", + TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); + TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); + TousseDefinition td_止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("止血带"); + addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null); - addRecyclingItem(jsonArray, "019000001", "0", "止血带", 1, "消毒物品", "", + addRecyclingItem(jsonArray, "019000001", "0", "止血带",td_止血带.getId(), 1, "消毒物品", "", null,appId); JSONObject params = new JSONObject(); @@ -170,7 +176,7 @@ /******* 修改回收数量 *******/ JSONArray jsonArray2 = new JSONArray(); String basketId = record.getClassifyBaskets().get(0).getId().toString(); - addRecyclingItem(jsonArray2, "019000001", basketId, "Test开胸包", 2, "器械包", "", + addRecyclingItem(jsonArray2, "019000001", basketId, "Test开胸包",td_Test开胸包.getId(), 2, "器械包", "", null); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); @@ -210,7 +216,7 @@ /******* 删除一种器械包 *******/ JSONArray jsonArray3 = new JSONArray(); - addRecyclingItem(jsonArray3, "019000001", basketId, "Test开胸包", -7, "器械包", "", + addRecyclingItem(jsonArray3, "019000001", basketId, "Test开胸包",td_Test开胸包.getId(), -7, "器械包", "", null); JSONObject params3 = new JSONObject(); params3.put("tousseJson", jsonArray3); @@ -254,7 +260,7 @@ /******* 添加一种器械包 *******/ JSONArray jsonArray4 = new JSONArray(); - addRecyclingItem(jsonArray4, "019000001", basketId, "Test开颅包", 2, "器械包", "", + addRecyclingItem(jsonArray4, "019000001", basketId, "Test开颅包",td_Test开胸包.getId(), 2, "器械包", "", null); JSONObject params4 = new JSONObject(); params4.put("tousseJson", jsonArray4);