Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r38609 -r38611 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38609) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38611) @@ -11703,17 +11703,16 @@ return; } List tis = null; + Long tdId = null; if(StringTools.equals(td.getTousseType(),TousseDefinition.PACKAGE_TYPE_SPLIT)){ - tis = objectDao.getBySql_ForUpdate2(TousseInstance.class.getSimpleName(),"where operationTime is null and po.tousseDefinition.parentID=" - + td.getParentID() - + " and recyclingRecordId="+packingTask.getSourceId() - + " order by po.id asc"); + tdId = td.getParentID(); }else{ - tis = objectDao.getBySql_ForUpdate2(TousseInstance.class.getSimpleName(),"where po.operationTime is null and po.tousseDefinition.id=" - +td.getId() - + " and recyclingRecordId="+packingTask.getSourceId() - + " order by po.id asc"); + tdId = td.getId(); } + 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)){ return; }