Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13463 -r13467 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13463) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13467) @@ -953,6 +953,7 @@ } error.setPackingTask_ID(historyPackingTaskId); } + setPackingTaskStatus(historyPackingTaskId,confirmation); } } if(item.getRecyclingDamages().size() > 0){ @@ -965,11 +966,26 @@ } damage.setPackingTask_ID(historyPackingTaskId); } + setPackingTaskStatus(historyPackingTaskId,confirmation); } } } } } + + private void setPackingTaskStatus(Long packingTaskId,boolean confirmation){ + if(packingTaskId != null){ + PackingTask packingTask = packingManager.getPackingTaskById("" + packingTaskId); + if(packingTask == null){ + throw new RuntimeException("ID = " + packingTaskId +"的装配任务已不存在!"); + } + if(!confirmation){ + packingTask.setStatus(PackingTask.STATUS_AWAIT_VERIFYING); + }else{ + packingTask.setStatus(PackingTask.STATUS_AWAIT_PACKING); + } + } + } private Long getUnionPackingTaskId(RecyclingRecord records, boolean confirmation, TousseItem item, Long historyPackingTaskId) { @@ -980,11 +996,6 @@ if (taskList != null && taskList.size() > 0) { PackingTask packingTask = taskList.get(0); historyPackingTaskId = packingTask.getId(); - if(!confirmation){ - packingTask.setStatus(PackingTask.STATUS_AWAIT_VERIFYING); - }else{ - packingTask.setStatus(PackingTask.STATUS_AWAIT_PACKING); - } } else { throw new RuntimeException(item.getTousseName() + ",装配任务已不存在!");