Index: ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java =================================================================== diff -u -r14296 -r14716 --- ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java (.../TestDisinfectGoodsSteriliManager.java) (revision 14296) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java (.../TestDisinfectGoodsSteriliManager.java) (revision 14716) @@ -419,13 +419,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(params.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null,null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); @@ -560,13 +579,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(params.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); @@ -700,13 +738,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(params.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); @@ -852,13 +909,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject packingParams = new JSONObject(); + packingParams.put("taskIds", ids); + packingParams.put("inspector", inspector); + packingParams.put("inspectorCode", inspectorCode); + packingParams.put("operator", operator); + packingParams.put("operatorCode", operatorCode); + packingParams.put("reviewer", reviewer); + packingParams.put("reviewerCode", reviewerCode); + packingParams.put("wrapper", wrapper); + packingParams.put("wrapperCode", wrapperCode); + packingParams.put("packageType", packageType); + packingParams.put("sterilingType", sterilingType); + packingParams.put("sterileDate", String.valueOf(System.currentTimeMillis())); + packingParams.put("stock", stock); + packingParams.put("packAmount", packAmountStr); + packingParams.put("taskGroup", taskGroup); + packingParams.put("splitPackage", splitPackage); + packingParams.put("basketBarcode", basketBarcode); + packingParams.put("idCardInstanceID", idCardBarcode); + packingParams.put("sterilizer", sterilizer); + packingParams.put("frequency", frequency); + packingParams.put("confirmContinue", "true"); + packingParams.put("urgentAmount", null); + packingParams.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(packingParams.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java =================================================================== diff -u -r14296 -r14716 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java (.../PackingTableManagerTests.java) (revision 14296) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java (.../PackingTableManagerTests.java) (revision 14716) @@ -249,14 +249,33 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession httpSession = null; + JSONObject params = new JSONObject(); + params.put("taskIds", packingTaskIds); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", sterileDateStr); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManager.packingTousse2(params.toString(), httpSession); - String str = packingTableManager.packingTousse2(packingTaskIds,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, sterileDateStr, stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, httpSession); - System.out.println("finished"); } @@ -466,13 +485,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", packingTaskIds); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", sterileDateStr); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManager.packingTousse2(params.toString(), session); - String str = packingTableManager.packingTousse2(packingTaskIds,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, sterileDateStr, stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); JSONArray tousses = json.optJSONArray("tousses"); @@ -538,13 +576,32 @@ idCardBarcode = ""; sterilizer = "2号灭菌炉"; frequency = "4"; + JSONObject packingParams = new JSONObject(); + packingParams.put("taskIds", packingTaskIds); + packingParams.put("inspector", inspector); + packingParams.put("inspectorCode", inspectorCode); + packingParams.put("operator", operator); + packingParams.put("operatorCode", operatorCode); + packingParams.put("reviewer", reviewer); + packingParams.put("reviewerCode", reviewerCode); + packingParams.put("wrapper", wrapper); + packingParams.put("wrapperCode", wrapperCode); + packingParams.put("packageType", packageType); + packingParams.put("sterilingType", sterilingType); + packingParams.put("sterileDate", sterileDateStr); + packingParams.put("stock", stock); + packingParams.put("packAmount", packAmountStr); + packingParams.put("taskGroup", taskGroup); + packingParams.put("splitPackage", splitPackage); + packingParams.put("basketBarcode", basketBarcode); + packingParams.put("idCardInstanceID", idCardBarcode); + packingParams.put("sterilizer", sterilizer); + packingParams.put("frequency", frequency); + packingParams.put("confirmContinue", "true"); + packingParams.put("urgentAmount", null); + packingParams.put("tousseWeight", ""); + str = packingTableManager.packingTousse2(packingParams.toString(), session); - str = packingTableManager.packingTousse2(packingTaskIds,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, sterileDateStr, stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); @@ -659,13 +716,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", packingTaskIds); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", sterileDateStr); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManager.packingTousse2(params.toString(), session); - String str = packingTableManager.packingTousse2(packingTaskIds,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, sterileDateStr, stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); JSONArray tousses = json.optJSONArray("tousses"); @@ -789,13 +865,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", packingTaskIds); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", sterileDateStr); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManager.packingTousse2(params.toString(), session); - String str = packingTableManager.packingTousse2(packingTaskIds,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, sterileDateStr, stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); JSONArray tousses = json.optJSONArray("tousses"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r14407 -r14716 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 14407) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 14716) @@ -270,13 +270,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(params.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); @@ -480,13 +499,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(params.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingWithAutoLoadToContainerTests.java =================================================================== diff -u -r14296 -r14716 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingWithAutoLoadToContainerTests.java (.../PackingWithAutoLoadToContainerTests.java) (revision 14296) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingWithAutoLoadToContainerTests.java (.../PackingWithAutoLoadToContainerTests.java) (revision 14716) @@ -79,13 +79,32 @@ String sterilizer = "1号灭菌炉"; String frequency = "3"; HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManagerTX.packingTousse2(params.toString(), session); - String str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, null, null, session); - JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); @@ -122,12 +141,32 @@ idCardBarcode = ""; sterilizer = "1号灭菌炉"; frequency = "3"; + params = new JSONObject(); + params.put("taskIds", ids); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", String.valueOf(System.currentTimeMillis())); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); - str = packingTableManagerTX.packingTousse2(ids,inspector,inspectorCode, - operator, operatorCode, reviewer, reviewerCode,wrapper,wrapperCode, - packageType, sterilingType, String.valueOf(System.currentTimeMillis()) , stock, packAmountStr, - taskGroup, splitPackage, basketBarcode, - idCardBarcode, sterilizer, frequency, "true" , null, session); + str = packingTableManagerTX.packingTousse2(params.toString(),session); json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success"));