Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java =================================================================== diff -u -r13963 -r14065 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 13963) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 14065) @@ -953,11 +953,9 @@ if (classifyBasket == null) { return null; } - - String contentStr = classifyBasket.getId() + "," - + classifyBasket.getContainerName() + ",1," - + classifyBasket.getContainerBarcode(); // 扫描的篮筐 - + + String contentStr = ""; + int totalGoodsAmount = 0; try { Set set = classifyBasket.getClassfiedItems(); if (CollectionUtils.isEmpty(set)) { @@ -979,9 +977,14 @@ if (StringUtils.isNotBlank(cleanMinutes)){ contentStr += "," + cleanMinutes; } + totalGoodsAmount += obj.optInt("amount"); contentStr += "$"; } + String basketStr = classifyBasket.getId() + "," + + classifyBasket.getContainerName() + "," + totalGoodsAmount + "," + + classifyBasket.getContainerBarcode(); // 扫描的篮筐 + contentStr = basketStr + contentStr; contentStr = contentStr.substring(0, contentStr.length() - 1); } catch (Exception e) { e.printStackTrace(); Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java =================================================================== diff -u -r14040 -r14065 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 14040) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 14065) @@ -643,11 +643,10 @@ // continue; // String containName = basket.getContainerName(); Set items = basket.getClassfiedItems(); - + int basketGoodsAmount = 0; JSONObject basketObj = new JSONObject(); basketObj.put("objName", basket.getContainerName()); basketObj.put("objBarcode", basket.getContainerBarcode()); - basketObj.put("objAmount", items.size()); basketObj.put("type", "BASKET"); basketObj.put("uiProvider", "col"); basketObj.put("cls", "master-task"); @@ -664,8 +663,11 @@ tousseInBasket.put("uiProvider", "col"); tousseInBasket.put("leaf", true); tousseInBasket.put("iconCls", "task"); - tousseInBasketArray.add(tousseInBasket); + tousseInBasketArray.add(tousseInBasket); + basketGoodsAmount += item.getAmount(); } + // 最后才统计物品数量 + basketObj.put("objAmount", basketGoodsAmount); basketObj.put("children", tousseInBasketArray); jsonArray.add(basketObj); }