Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r35544 -r35545 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35544) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35545) @@ -9172,7 +9172,7 @@ } InvoicePlan ip = verifyPreRecycledByOtherApplication(invoicePlanId, verifyBarcode); if(ip != null){ - return StringUtils.isNotBlank(idCardInstanceBarcode)?idCardInstanceBarcode:verifyBarcode + return (StringUtils.isNotBlank(idCardInstanceBarcode)?idCardInstanceBarcode:verifyBarcode) + "【"+ td.getName() +"】已经被【" + ip.getDepart() @@ -9189,9 +9189,9 @@ * @return 返回被预回收的申请单 */ private InvoicePlan verifyPreRecycledByOtherApplication(Long invoicePlanId, String barcode){ - String sql = " where po.id<>" + String sql = " join fetch po.applicationItems its where po.id<>" + invoicePlanId - +" and po.applicationItems.id in (select tousseItemId from " + +" and its.id in (select tousseItemId from " + PrepareRecyleScanBarcode.class.getSimpleName() + " where tousseInstanceBarcode='" + barcode