Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r18671 -r18674 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 18671) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 18674) @@ -1899,8 +1899,8 @@ } } - private void setRecyclingErrorAndDamagePackingTaskId(RecyclingRecord records,Map idToTDMap,boolean confirmation) { - for (RecyclingItem item : records.getItems()) { + private void setRecyclingErrorAndDamagePackingTaskId(RecyclingRecord record,Map idToTDMap,boolean confirmation) { + for (RecyclingItem item : record.getItems()) { Long historyPackingTaskId = item.getHistoryPackingTaskId(); TousseDefinition td = getTousseDefinition(idToTDMap,item.getTousseDefinitionId()); if(TousseDefinition.STR_YES.equals(td.getIsPacking())){ @@ -1918,7 +1918,7 @@ } if (historyPackingTaskId == null) { historyPackingTaskId = getUnionPackingTaskId( - records, confirmation, item, + record, confirmation, item, historyPackingTaskId,detail); } detail.setPackingTaskId(historyPackingTaskId); @@ -1932,11 +1932,11 @@ } } } - setLostIDCardPackingTaskId(records, item, idCardLostList,confirmation); + setLostIDCardPackingTaskId(record, item, idCardLostList,confirmation); //添加了丢失或报损记录后,最终又改为0了 if(!haveErrorOrDamage){ List taskList = packingManager - .getPackingTask(records.getId(), + .getPackingTask(record.getId(), item.getTousseDefinitionId(), PackingTask.TASK_RECYCLINGRECORD); if(taskList != null){