Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r16437 -r16668 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 16437) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 16668) @@ -786,6 +786,9 @@ return classifiedItem; } + /** + * 保存回收单,重点是切换篮筐功能,容易出错 + */ @Override public synchronized void saveOrUpdate(RecyclingRecord record,JSONObject params) { @@ -1543,9 +1546,11 @@ for (JSONObject json : itemJsonList) { Long tousseDefinitionID = json.optLong("tousseDefinitionID"); TousseItem item = itemMap.get(tousseDefinitionID); + boolean isNewAddTousse = false; if(item == null){ item = new TousseItem(); itemMap.put(tousseDefinitionID, item); + isNewAddTousse = true; } item.setAmount(0); @@ -1579,7 +1584,7 @@ //不装配不追溯物品 newUnPackingTousseInstanceOrDisinfectGoodsDefinition( record, application, recyclingAmount, - true, td, item, json, errors, damages, + isNewAddTousse, td, item, json, errors, damages, basketItemJson, urgentTousseItems,itemMap); } application.setApplicationItems(tousseItems);