Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java =================================================================== diff -u -r36562 -r39055 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 36562) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 39055) @@ -833,7 +833,7 @@ if(allowPackingWhenUnSupplementMaterial && tousseInstance != null && BooleanUtils.isTrue(tousseInstance.getHaveUnSupplementMaterials())){ - String sql = String.format("po.tousseBarcode = '%s' and po.amount > po.additionalAmount and po.materialDefinitionId in (select mi.materialDefinition.id from MaterialInstance mi where tousse_id=%s)", tousseInstance.getBarcode() + String sql = String.format("(po.tousseBarcode = '%s' or po.tousseInstanceId="+ tousseInstance.getId() +" ) and po.amount > po.additionalAmount and po.materialDefinitionId in (select mi.materialDefinition.id from MaterialInstance mi where tousse_id=%s)", tousseInstance.getBarcode() ,ancestorTd.getId()); return getByHql(sql); }