Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r17552 -r17553 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17552) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17553) @@ -1338,8 +1338,8 @@ item.getTousseDefinitionId(), PackingTask.TASK_RECYCLINGRECORD); if (CollectionUtils.isNotEmpty(taskList)) { - PackingTask packingTask = null; - if(detail.isIDCard()){ + PackingTask packingTask = taskList.get(0); + /*if(detail.isIDCard()){ //丢失的标识牌关联上相应的装配任务(回收多个标识牌,放入不同的篮筐,装配任务多条) for (PackingTask task : taskList) { List idCardTasks = packingManager.findIDCardForPackingTask(task.getId()); @@ -1354,7 +1354,7 @@ } if(packingTask == null){ throw new RuntimeException("异常数据,请联系管理员!"); - } + }*/ historyPackingTaskId = packingTask.getId(); } else { throw new RuntimeException(item.getTousseName()