Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r15173 -r15182 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 15173) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 15182) @@ -879,7 +879,6 @@ public String getWaitTransitionItems(JSONObject params){ JSONObject obj = new JSONObject(); JSONArray tousseItemArray = new JSONArray(); - JSONArray tousseBarcodeArray = new JSONArray(); String comfirmor = ""; String operator = ""; String prepareRecycleDateTime = ""; @@ -933,15 +932,14 @@ }else{ scanedAmount = item.getScanedAmount().intValue(); } - if(item.getUnscanedAmount() == null || item.getUnscanedAmount().intValue() == 0){ - unscanedAmount = MathTools.sub(prepareRecycleAmount, scanedAmount).intValue(); - + if(item.getUnscanedAmount() == null){ + unscanedAmount = 0; } jsonItem.put("scanedAmount", scanedAmount); jsonItem.put("unscanedAmount", unscanedAmount); jsonItem.put("tousseDefineId", item.getTousseDefinitionId()); + jsonItem.put("tousseBarcodes", barcodes); tousseItemArray.add(jsonItem); - tousseBarcodeArray.addAll(barcodes); } } comfirmor = p.getPrepareRecycleComfirmor(); @@ -961,7 +959,6 @@ obj.put("operator", operator); obj.put("prepareRecycleDateTime", prepareRecycleDateTime); obj.put("items", tousseItemArray); - obj.put("tousseBarcodes", tousseBarcodeArray); return obj.toString(); } /**