Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java =================================================================== diff -u -r37898 -r38222 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java (.../ClassifyBasketManagerImpl.java) (revision 37898) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java (.../ClassifyBasketManagerImpl.java) (revision 38222) @@ -284,14 +284,12 @@ " left join IDCardDefinition idd on idd.id = c.idCardDefinitionId "+ " left join MaterialDefinition md on md.id = ci.materialdefinition_id "+ " left join TousseDefinition td on td.id = ci.toussedefinition_id "+ - " left join RecyclingRecord rr on rr.id = ci.recyclingRecordId "+ - " left join ClassifyBasket_WashRecord cw on cw.ClassifyBasket_ID = cb.id "+ - " left join washAndDisinfectRecord wr on cw.WashAndDisinfectRecord_ID = wr.id "); + " left join RecyclingRecord rr on rr.id = ci.recyclingRecordId "); //where sql.append(String.format(" where c.purpose = '%s' and %s and c.status = '%s' "+ - " and wr.id is null "+ + " and not exists (select 1 from ClassifyBasket_WashRecord cw where cw.ClassifyBasket_ID=cb.id ) "+ " and cb.classifyBasketStatus = 0 " + - " and cb.id not in (select classifyBasketId from PackingRecord_ClassifyBasket where classifyBasketId is not null) " + " and not exists (select 1 from PackingRecord_ClassifyBasket where classifyBasketId is not null and cb.id = classifyBasketId) " , Container.CONTAINER_PURPOSE_CLEAN_BASKET,codingSql,Container.CONTAINER_STATUS_WASHLOADING)); //order sql.append(" order by cb.recyclingTime desc ");