Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java =================================================================== diff -u -r12340 -r12800 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 12340) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 12800) @@ -54,7 +54,6 @@ disinfectionTousse.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); disinfectionTousse.setIsTraceable("否"); disinfectionTousse.setName("止血带"); -// disinfectionTousse.setInvoicePlanID(appId); disinfectionTousse.setPrice(2.5); disinfectionTousse.setForDisplay(false); disinfectionTousse.setIsCleanedEntirely("否"); @@ -69,10 +68,9 @@ long appId = app.getId(); + disinfectionTousse.setInvoicePlanID(appId); + objectDao.saveOrUpdate(disinfectionTousse); - - - JSONArray jsonArray = new JSONArray(); TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); TousseDefinition td_止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("止血带"); @@ -256,9 +254,9 @@ assertEquals(1, tousseItem34.getAmount().intValue()); /******* 添加一种器械包 *******/ - + TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); JSONArray jsonArray4 = new JSONArray(); - addRecyclingItem(jsonArray4, "019000001", basketId, "Test开颅包",td_Test开胸包.getId(), 2, "器械包", "", + addRecyclingItem(jsonArray4, "019000001", basketId, "Test开颅包",td.getId(), 2, "器械包", "", null); JSONObject params4 = new JSONObject(); params4.put("tousseJson", jsonArray4);