Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
===================================================================
diff -u -r28549 -r28550
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java	(.../ClassifyBasketManager.java)	(revision 28549)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java	(.../ClassifyBasketManager.java)	(revision 28550)
@@ -74,10 +74,4 @@
 	 * @return
 	 */
 	public List<Long> getCountOfClassifyBasketWashRecordByClassifyBasketId(Long classifyBasketId);
-	/**
-	 * 从指定的篮筐中,获取清洗状态不为清洗完成的篮筐条码
-	 * @param containerBarcodes 指定的篮筐条码
-	 * @return 清洗状态不为清洗完成的篮筐条码
-	 */
-	public Set<String> getContainerBarcodeOfNotWashed(Set<String> containerBarcodes);
 }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r28533 -r28550
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 28533)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 28550)
@@ -1507,7 +1507,13 @@
 				checkBasketBarcodeSet = new HashSet<String>();
 			}
 			//从指定的篮筐条码中,获取清洗状态不为清洗完成的篮筐条码
-			Set<String> containerBarcodesOfnotWashed = classifyBasketManager.getContainerBarcodeOfNotWashed(checkBasketBarcodeSet);
+			Set<String> containerBarcodesOfnotWashed = new HashSet<String>();
+			List<ClassifyBasket> unAWashedClassifyBasket = classifyBasketManager.getUnWashedAndTousseItemUnEndBasket(checkBasketBarcodeSet);
+			if(CollectionUtils.isNotEmpty(unAWashedClassifyBasket)){
+				for (ClassifyBasket classifyBasket : unAWashedClassifyBasket) {
+					containerBarcodesOfnotWashed.add(classifyBasket.getContainerBarcode());
+				}
+			}
 			String notWashedInfo = "";//返回前台的关于篮筐未清洗的提示信息
 			for (Object[] result : taskList) {
 				
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
===================================================================
diff -u -r28549 -r28550
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java	(.../ClassifyBasketManagerImpl.java)	(revision 28549)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java	(.../ClassifyBasketManagerImpl.java)	(revision 28550)
@@ -305,36 +305,6 @@
 		return ids;
 	}
 	@Override
-	public Set<String> getContainerBarcodeOfNotWashed(
-			Set<String> containerBarcodes) {
-		if(CollectionUtils.isEmpty(containerBarcodes)){
-			return new HashSet<String>();
-		}
-		Set<String> resultSet = new HashSet<String>();
-		String sql = String.format("select cb.containerBarcode from %s cb "
-				+ "left join ClassifyBasket_WashRecord cw on cw.ClassifyBasket_ID=cb.id "
-				+ "left join %s wr on wr.id=cw.WashAndDisinfectRecord_ID where %s "
-				+ "and (cw.WashAndDisinfectRecord_ID is null or wr.washStatus<> '%s' ) ",
-				ClassifyBasket.class.getSimpleName(),
-				WashAndDisinfectRecord.class.getSimpleName(),
-				SqlUtils.getStringFieldInLargeCollectionsPredicate("cb.containerBarcode", containerBarcodes, " 1=1 "),
-				WashAndDisinfectRecord.STATUS_WASHED);
-		ResultSet rs = null;
-		try {
-			logger.debug("从指定篮筐条码中获取非清洗完成状态的篮筐条码sql:" + sql);
-			rs = objectDao.executeSql(sql);
-			while(rs.next()){
-				String containerBarcode = rs.getString("containerBarcode");
-				resultSet.add(containerBarcode);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			DatabaseUtil.closeResultSetAndStatement(rs);
-		}
-		return resultSet;
-	}
-	@Override
 	public List<ClassifyBasket> getUnWashedAndTousseItemUnEndBasket(Collection<String> barcodes) {
 		if(CollectionUtils.isEmpty(barcodes)){
 			return null;