Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r38814 -r38851 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38814) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38851) @@ -7552,6 +7552,7 @@ List tis = objectDao.getBySql_ForUpdate2(TousseInstance.class.getSimpleName(),"where po.operationTime is null and po.tousseDefinition.id=" +td.getId() + " and recyclingRecordId="+currentPackingTask.getSourceId() + +(StringUtils.isNotBlank(currentPackingTask.getIdCardBarcode())?" and po.idCardInstanceBarcode='"+ currentPackingTask.getIdCardBarcode() +"' ":"") + " order by po.id asc"); if(CollectionUtils.isNotEmpty(tis)){ tousseInstance = tis.get(0);