Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r35571 -r35572 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35571) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35572) @@ -9142,9 +9142,6 @@ * @return */ private String getVerifyPreRecycledByOtherApplicationMsg(Long invoicePlanId, String idCardInstanceBarcode, TousseDefinition td, String verifyBarcode){ - if(!DatabaseUtil.isPoIdValid(invoicePlanId)){ - return "参数异常invoicePlanId:"+invoicePlanId; - } InvoicePlan ip = verifyPreRecycledByOtherApplication(invoicePlanId, verifyBarcode); if(ip != null){ return (StringUtils.isNotBlank(idCardInstanceBarcode)?idCardInstanceBarcode:verifyBarcode) @@ -9164,13 +9161,17 @@ * @return 返回被预回收的申请单 */ private InvoicePlan verifyPreRecycledByOtherApplication(Long invoicePlanId, String barcode){ - String sql = " join fetch po.applicationItems its where po.id<>" - + invoicePlanId - +" and its.id in (select tousseItemId from " + String invoicePlanIdSql = null; + if(DatabaseUtil.isPoIdValid(invoicePlanId)){ + invoicePlanIdSql = " and po.id<>" + invoicePlanId; + }else{ + invoicePlanIdSql = ""; + } + String sql = " join fetch po.applicationItems its where its.id in (select tousseItemId from " + PrepareRecyleScanBarcode.class.getSimpleName() + " where tousseInstanceBarcode='" + barcode - +"') "; + +"') "+ invoicePlanIdSql; return (InvoicePlan)objectDao.getBySql(InvoicePlan.class.getSimpleName(),sql); } /**