Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r38620 -r38621 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38620) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38621) @@ -11712,11 +11712,12 @@ List tis = objectDao.getBySql_ForUpdate2(TousseInstance.class.getSimpleName(),"where po.operationTime is null and po.tousseDefinition.id=" + tdId + " and recyclingRecordId="+packingTask.getSourceId() + +(StringUtils.isBlank(packingTask.getIdCardBarcode())?"":" and idCardInstanceBarcode='"+ packingTask.getIdCardBarcode() +"'") + " order by po.id asc"); if(CollectionUtils.isEmpty(tis)){ return; } - if(MathTools.sub(packingTask.getUnPackAmount(), reduceAmount).intValue() <= 0){ + if(MathTools.sub(packingTask.getUnPackAmount(), reduceAmount).intValue() == 0 && reduceAmount == tis.size()){ objectDao.deleteAll(tis); }else{ List delTis = new ArrayList();