Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
===================================================================
diff -u -r31853 -r36475
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java	(.../ClassifyBasketManagerImpl.java)	(revision 31853)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java	(.../ClassifyBasketManagerImpl.java)	(revision 36475)
@@ -99,10 +99,6 @@
 	
 		return null;
 	}
-	
-	/**
-	 * 获取未清洗未装配的篮筐
-	 */
 	@Override
 	public ClassifyBasket getUnWashedAndUnPackingBasket(String barcode) {
 		if (StringUtils.isNotBlank(barcode)) {
@@ -111,13 +107,25 @@
 					barcode);
 			List list = objectDao.findByHql(sql);
 			if(list.size() > 0) {
-				Object[] objArray = (Object[]) list.get(0);
-				Object classifyBasketObj = objArray[0];
-				Object washRecordObj = objArray[1];
-				if (washRecordObj == null && classifyBasketObj instanceof ClassifyBasket) {
-					ClassifyBasket basket = (ClassifyBasket) objArray[0];
-					return basket;
+				List<ClassifyBasket> baskets = null;
+				for (int i = 0; i < list.size(); i++) {
+					Object[] objArray = (Object[]) list.get(0);
+					Object classifyBasketObj = objArray[0];
+					Object washRecordObj = objArray[1];
+					
+					if (washRecordObj == null && classifyBasketObj instanceof ClassifyBasket) {
+						ClassifyBasket basket = (ClassifyBasket) classifyBasketObj;
+						if(CollectionUtils.isNotEmpty(basket.getClassfiedItems())){
+							return basket;
+						}else if(baskets == null){
+							baskets = new ArrayList<ClassifyBasket>();
+						}
+						baskets.add(basket);
+					}
 				}
+				if(CollectionUtils.isNotEmpty(baskets)){
+					return baskets.get(0);
+				}
 			}
 		}
 		return null;