Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r32865 -r32866 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 32865) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 32866) @@ -1500,6 +1500,8 @@ if (Constants.STR_YES.equals(includeImplant)) { if(mi.getImplantAmountOfUseRecord() != null){ implantAmountOfUseRecord = ("" + mi.getImplantAmountOfUseRecord()); + }else{ + implantAmountOfUseRecord = "0"; } } @@ -1570,9 +1572,6 @@ for (int i = 0; i < len; i++) { JSONObject obj = jsonArray.optJSONObject(i); long materialDefinitionId = obj.optLong("materialDefinitionId"); - if(StringUtils.isBlank(obj.optString("amount"))){ - continue; - } int amount = obj.optInt("amount"); if (CollectionUtils.isNotEmpty(tousseInstanceImplantDataList)) { boolean found = false; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r32707 -r32866 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 32707) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 32866) @@ -223,8 +223,6 @@ } if(mi.getImplantAmountOfUseRecord() != null){ implantAmountOfUseRecord = "" + mi.getImplantAmountOfUseRecord(); - }else{ - implantAmountOfUseRecord = "0"; } } JSONObject obj = new JSONObject(); @@ -419,6 +417,10 @@ for (int i = 0; i < len; i++) { JSONObject obj = jsonArray.optJSONObject(i); String mi_id = obj.optString("mi_id"); + if(StringUtils.isBlank(obj.optString("amount"))){ + //数量没值,不需要修改植入物使用数量 + continue; + } Integer amount = obj.optInt("amount"); MaterialInstance mi = materialInstanceManager .get(mi_id);