Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r38611 -r38614 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38611) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38614) @@ -11702,18 +11702,17 @@ if(reduceAmount <= 0 && !MathTools.equals(PackingTask.TASK_RECYCLINGRECORD, packingTask.getTaskType())){ return; } - List tis = null; Long tdId = null; if(StringTools.equals(td.getTousseType(),TousseDefinition.PACKAGE_TYPE_SPLIT)){ tdId = td.getParentID(); }else{ tdId = td.getId(); } - tis = objectDao.getBySql_ForUpdate2(TousseInstance.class.getSimpleName(),"where po.operationTime is null and po.tousseDefinition.id=" + List tis = objectDao.getBySql_ForUpdate2(TousseInstance.class.getSimpleName(),"where po.operationTime is null and po.tousseDefinition.id=" + tdId + " and recyclingRecordId="+packingTask.getSourceId() + " order by po.id asc"); - if(CollectionUtils.isNotEmpty(tis)){ + if(CollectionUtils.isEmpty(tis)){ return; } if(MathTools.sub(packingTask.getUnPackAmount(), reduceAmount).intValue() <= 0){