Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r15547 -r15626 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 15547) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 15626) @@ -32,7 +32,7 @@ public RecyclingApplication getRecyclingApplicationById(String id); // 根据器械包实例的条码,获取包含该器械包的待回收的申请单 - public RecyclingApplication getWaitingRecycleApplicationIdContaintTousseInstance(String instantceBarcode); + public RecyclingApplication getRecycleApplicationByTousseBarcode(String instantceBarcode); public InvoicePlan getRecyclingApplicationByIdForRecycle(String id); public RecyclingApplication findRecyclingApplicationBySql(String sql); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r15604 -r15626 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15604) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15626) @@ -4042,10 +4042,9 @@ // } // 根据器械包实例的条码,获取包含该器械包的待回收的申请单的ID,取满足条件的第一张申请单 - public RecyclingApplication getWaitingRecycleApplicationIdContaintTousseInstance(String instantceBarcode){ + public RecyclingApplication getRecycleApplicationByTousseBarcode(String instantceBarcode){ String sql = String - .format("where po.recyclingStatus != '%s' and po.committedStatus = 1 and po.endStatus is null and po.tousseBarcodes like '%%%s%%'", - InvoicePlan.RECYCLINGSTATUS_RECYCLED, instantceBarcode); + .format("where po.committedStatus = 1 and po.endStatus is null and po.tousseBarcodes like '%%%s%%'", instantceBarcode); return (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), sql); }