Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java =================================================================== diff -u -r40302 -r40704 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java (.../ClassifyBasketManagerImpl.java) (revision 40302) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java (.../ClassifyBasketManagerImpl.java) (revision 40704) @@ -539,24 +539,24 @@ RecyclingRecord recyclingRecord = list.get(0); List classifyBaskets = recyclingRecord.getClassifyBaskets(); if(CollectionUtils.isNotEmpty(classifyBaskets)){ - //没有清洗的篮筐才需要释放 - List unWashClassifyBasketList = new ArrayList(); + //清洗篮筐 + List washClassifyBasketList = new ArrayList(); Map barcodeContainerMap = new HashMap(); for (ClassifyBasket classifyBasket : classifyBaskets) { Container container = containerManager.getContainerByBarcode(classifyBasket.getContainerBarcode()); if(container == null){ continue; } //篮筐释放已经清洗了,不需要释放篮筐 - List washAndDisinfectRecords = classifyBasket.getWashAndDisinfectRecords(); + /*List washAndDisinfectRecords = classifyBasket.getWashAndDisinfectRecords(); if(CollectionUtils.isNotEmpty(washAndDisinfectRecords)){ continue; - } - unWashClassifyBasketList.add(classifyBasket); + }*/ + washClassifyBasketList.add(classifyBasket); barcodeContainerMap.put(classifyBasket.getContainerBarcode(), container); } - if(CollectionUtils.isEmpty(unWashClassifyBasketList)){ + if(CollectionUtils.isEmpty(washClassifyBasketList)){ return; } @@ -565,7 +565,7 @@ //需要拆分的篮筐 Map splitClassifyBasketMap = new HashMap(); for (TousseDefinition tousseDefinition : willReturnTousseDefinitions) { - for (ClassifyBasket classifyBasket : unWashClassifyBasketList) { + for (ClassifyBasket classifyBasket : washClassifyBasketList) { List classfiedItems = classifyBasket.getClassfiedItems(); if(CollectionUtils.isEmpty(classfiedItems)){ continue; @@ -588,6 +588,13 @@ if(multipleTousseFromSameRecyclingRecordIntoSameBasket){ continue; } + + //篮筐释放已经清洗了,不支持拆分篮筐 + List washAndDisinfectRecords = classifyBasket.getWashAndDisinfectRecords(); + if(CollectionUtils.isNotEmpty(washAndDisinfectRecords)){ + continue; + } + splitClassifyBasketMap.put(tousseDefinition.getId(), classifyBasket); } }