Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r26938 -r26939 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26938) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26939) @@ -404,8 +404,9 @@ if (task != null) { String tousseName = ""; - if(task.getTousseDefinition() != null){ - tousseName = task.getTousseDefinition().getName(); + TousseDefinition td = task.getTousseDefinition(); + if(td != null){ + tousseName = td.getName(); } String description = "删除装配任务[id:" + task.getId() + ",名称:" + tousseName + ",数量:" + task.getAmount() +",原因:"+cause+ "]"; @@ -424,7 +425,9 @@ } } String basketBarcode = task.getBasketBarcode(); - classifiedItemManager.updateNumOfUnwashedStopsByPackingTask(task); + if(td.cleanedEntirely()){ + classifiedItemManager.updateNumOfUnwashedStopsByPackingTask(task); + } objectDao.delete(task); //修改篮筐状态 updateContainerStatus(basketBarcode);