Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r22025 -r22081 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 22025) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 22081) @@ -2735,9 +2735,9 @@ String sql = String.format("where po.id = '%s'", invoicePlanId); invoicePlanList = objectDao.findBySql(InvoicePlan.class.getSimpleName(),sql); }else{ - //获得类型为高值耗材且审核结束的申请单 - String sql = String.format("where po.type = '%s' and po.processStatus = '%s'", - InvoicePlan.TYPE_EXPENSIVEGOODS_FORM,InvoicePlan.PROCESSSTATUS_BE_THROUGH_WITH); + //获得类型为高值耗材且审核结束且不为已终止的申请单 + String sql = String.format("where po.type = '%s' and po.processStatus = '%s' and po.endStatus <> '%s'", + InvoicePlan.TYPE_EXPENSIVEGOODS_FORM,InvoicePlan.PROCESSSTATUS_BE_THROUGH_WITH,InvoicePlan.STATUS_END); invoicePlanList = objectDao.findBySql(InvoicePlan.class.getSimpleName(),sql); if(CollectionUtils.isNotEmpty(invoicePlanList)){ //若申请单已被绑定入库且绑定的实例已有使用记录则:不显示该申请单