Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r33237 -r33371 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33237) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33371) @@ -8618,7 +8618,7 @@ } } /** - * SZSDSRMYY-75 包条码是否存在于其它申请单 + * SZSDSRMYY-75 包条码是否存在于其它未终止的申请单 * @param ti 包实例 * @param invoicePlanId 申请单id * @return @@ -8628,7 +8628,7 @@ if(!recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode){ return null; } - String sql = String.format("select depart,serialNumber from %s where tousseBarcodes like '%%%s%%' %s " + String sql = String.format("select depart,serialNumber from %s where (endStatus is null or endStatus<>'"+ InvoicePlan.STATUS_END +"') and tousseBarcodes like '%%%s%%' %s " , InvoicePlan.class.getSimpleName() ,ti.getBarcode() ,DatabaseUtil.isPoIdValid(invoicePlanId)?" and id<>" + invoicePlanId:"");