Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r14067 -r14072 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14067) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14072) @@ -269,10 +269,6 @@ var materials = []; for (var j=0; j < materialNodes.length; j++){ var materialNode = materialNodes[j]; - if(materialNode.get("amount") <= 0){ - msg = "外来器械材料数量必须大于0!"; - break; - } if(materialNode.get("includeImplant") == ""){ msg = "外来器械材料必须填写是否植入物!"; break; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r14036 -r14072 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14036) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14072) @@ -451,9 +451,6 @@ String materialInstanceId = materialJson.optString("materialInstanceId"); String materialName = materialJson.optString("materialName"); Integer amount = materialJson.optInt("amount"); - if(amount == null || amount == 0){ - throw new RuntimeException("材料数量必须大于0!"); - } String includeImplant = materialJson.optString("includeImplant"); String usedAmountOfIncludeImplant = materialJson.optString("usedAmountOfIncludeImplant"); String minDismantleAmount = materialJson.optString("minDismantleAmount"); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r13963 -r14072 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 13963) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14072) @@ -3288,7 +3288,11 @@ } //追溯清洗的多个篮筐 if(TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(td.getTousseType()) || TousseDefinition.PACKAGE_TYPE_SPLIT.equals(td.getTousseType())){ - tousseInstance.setClassifyBasketIds("" + tousseInstance.getClassifyBasket_id()); + String classifyBasketIds = ""; + if(tousseInstance.getClassifyBasket_id() != null){ + classifyBasketIds = tousseInstance.getClassifyBasket_id().toString(); + } + tousseInstance.setClassifyBasketIds(classifyBasketIds); }else{ if(PackingTask.TASK_RECYCLINGRECORD.equals(currentPackingTask.getTaskType())){ String basketBarcodes = currentPackingTask.getBasketBarcode();