Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
===================================================================
diff -u -r26913 -r26927
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java	(.../ContainerStatusTests.java)	(revision 26913)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java	(.../ContainerStatusTests.java)	(revision 26927)
@@ -219,8 +219,8 @@
 		prepareData();
 		//终止申请单
 		terminateInvoicePlan();
-		//篮筐状态为装配完成
-		assertEquals(getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1), Container.CONTAINER_STATUS_PACKED);
+		//篮筐状态为清洗装载
+		assertEquals(getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1), Container.CONTAINER_STATUS_WASHLOADING);
 		//清洗
 		wash(Constants.RinserName.RINSER_1,Constants.CleanMethodName.CLEAN_METHOD_NAME_P1);
 		//篮筐状态为空闲
@@ -234,8 +234,8 @@
 		prepareData();
 		//终止申请单
 		terminateInvoicePlan();
-		//篮筐状态为装配完成
-		assertEquals(getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1), Container.CONTAINER_STATUS_PACKED);
+		//篮筐状态为清洗装载
+		assertEquals(getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1), Container.CONTAINER_STATUS_WASHLOADING);
 		//清洗
 		wash(Constants.RinserName.RINSER_2,Constants.CleanMethodName.CLEAN_METHOD_NAME_P5);
 		//篮筐状态为清洗中
@@ -252,8 +252,8 @@
 		prepareData();
 		//终止申请单
 		terminateInvoicePlan();
-		//篮筐状态为装配完成
-		assertEquals(getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1), Container.CONTAINER_STATUS_PACKED);
+		//篮筐状态为清洗装载
+		assertEquals(getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1), Container.CONTAINER_STATUS_WASHLOADING);
 		//清洗
 		wash(Constants.RinserName.RINSER_2,Constants.CleanMethodName.CLEAN_METHOD_NAME_P5);
 		//篮筐状态为清洗中
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r26913 -r26927
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 26913)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 26927)
@@ -976,7 +976,7 @@
 						}
 					}
 				}
-			}else if(!Container.CONTAINER_STATUS_PACKED.equals(container.getStatus())){
+			}else{
 				classifyBasket = getUnWashedBasketByBasketBarcode(unWashedBasketMap, basketBarcode);
 			}
 			if (classifyBasket == null) {
@@ -5073,17 +5073,9 @@
 	 */
 	private Map<String, ClassifyBasket> getBasketUsedVolume(Map<String, Double> percentageMap, List<CustomIntoBasket> customIntoBaskets) {
 		Map<String, ClassifyBasket> map = new HashMap<String, ClassifyBasket>();
-		Collection<String> barcodeSet = new HashSet<String>();
 		for (CustomIntoBasket customIntoBaset : customIntoBaskets) {
-			barcodeSet.add(customIntoBaset.getBarcode());		
-		}
-		barcodeSet = containerManager.filterStatusContainer(barcodeSet, Container.CONTAINER_STATUS_PACKED,false);
-		for (CustomIntoBasket customIntoBaset : customIntoBaskets) {
 			String barcode = customIntoBaset.getBarcode();
-			ClassifyBasket basket = null;
-			if(!barcodeSet.contains(barcode)){
-				basket = classifyBasketManager.getUnWashedBasket(barcode);
-			}
+			ClassifyBasket basket = classifyBasketManager.getUnWashedBasket(barcode);
 			Double percentage = 0.00;
 			//持久化到数据库中的篮筐内物品
 			if(basket != null){
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r26918 -r26927
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26918)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26927)
@@ -4998,10 +4998,7 @@
 					int count = objectDao.countObjectBySql(PackingTask.class.getSimpleName(), sql);
 					if(count == 0){
 						Container container = containerManager.getContainerByBarcode(basketBarcode);
-						if(container == null){
-							continue;
-						}
-						if(container.washed() || container.washloading()){
+						if(container != null && container.washed()){
 							container.setStatus(Container.CONTAINER_STATUS_PACKED);
 							containerManager.saveOrUpdate(container);
 						}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r26913 -r26927
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26913)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26927)
@@ -11,7 +11,6 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -866,7 +865,7 @@
 					}
 				}
 			}
-			if (classifyBasket == null && !Container.CONTAINER_STATUS_PACKED.equals(container.getStatus())) {
+			if (classifyBasket == null) {
 				classifyBasket = classifyBasketManager.getUnWashedBasket(container.getBarcode());
 			}
 			if (classifyBasket == null) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
===================================================================
diff -u -r26921 -r26927
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java	(.../ContainerManagerImpl.java)	(revision 26921)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java	(.../ContainerManagerImpl.java)	(revision 26927)
@@ -3,8 +3,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 
 import net.sf.json.JSONObject;
@@ -24,7 +22,6 @@
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
-import com.forgon.tools.util.SqlUtils;
 
 /**
  * @author WangYi
@@ -654,39 +651,5 @@
 		}
 		return list;
 	}
-	@Override
-	public Collection<String> filterStatusContainer(Collection<String> barcodes, String status, Boolean isExclude) {
-		ResultSet rs = null;
-		Collection<String> result = new HashSet<String>();
-		try {
-			String equalSql = null;
-			if(isExclude == null || isExclude){
-				equalSql = "<>";
-			}else{
-				equalSql = "=";
-			}
-			String sql = new StringBuffer(140)
-			.append(" select bd.barcode from ")
-			.append(Container.class.getSimpleName())
-			.append(" c inner join ")
-			.append(BarcodeDevice.class.getSimpleName())
-			.append(" bd on c.id=bd.id where ")
-			.append(SqlUtils.getStringFieldInLargeCollectionsPredicate("bd.barcode", barcodes))
-			.append(" and status")
-			.append(equalSql)
-			.append("'")
-			.append(status)
-			.append("'").toString();
-			rs = objectDao.executeSql(sql);
-			while(rs.next()){
-				String barcode = rs.getString("barcode"); 
-				result.add(barcode);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}finally {
-			DatabaseUtil.closeResultSetAndStatement(rs);
-		}
-		return result;
-	}
+
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
===================================================================
diff -u -r26913 -r26927
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java	(.../TousseIntoBasketService.java)	(revision 26913)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java	(.../TousseIntoBasketService.java)	(revision 26927)
@@ -15,9 +15,7 @@
 import org.apache.log4j.Logger;
 
 import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifyBasketManager;
-import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
-import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.idpredicate.IDOperators;
@@ -125,10 +123,7 @@
 	}
 	private ClassifyBasketManager classifyBasketManager;
 	private TousseDefinitionManager tousseDefinitionManager;
-	private ContainerManager containerManager;
-	public void setContainerManager(ContainerManager containerManager) {
-		this.containerManager = containerManager;
-	}
+	
 	public void setClassifyBasketManager(ClassifyBasketManager classifyBasketManager) {
 		this.classifyBasketManager = classifyBasketManager;
 	}
@@ -249,10 +244,6 @@
 			//如果可以入多套外来器械,就不需要管当前篮筐里面已经装载的包了，只需要本次入筐的物品进行验证就可行了
 			return;
 		}
-		barcodes = containerManager.filterStatusContainer(barcodes,Container.CONTAINER_STATUS_PACKED,true);
-		if(barcodes == null || barcodes.size() ==0){
-			return;
-		}
 		List<ClassifyBasket> baskets = classifyBasketManager.getUnWashedBaskets(barcodes);
 		if(CollectionUtils.isNotEmpty(baskets)){
 			List<Long> tdIds = new ArrayList<Long>();
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
===================================================================
diff -u -r26913 -r26927
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java	(.../ContainerManager.java)	(revision 26913)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java	(.../ContainerManager.java)	(revision 26927)
@@ -1,6 +1,5 @@
 package com.forgon.disinfectsystem.basedatamanager.container.service;
 
-import java.util.Collection;
 import java.util.List;
 
 import com.forgon.disinfectsystem.basedatamanager.container.ContainerWaitPackingTaskVo;
@@ -102,12 +101,5 @@
 	 * @return 装配任务的
 	 */
 	public List<ContainerWaitPackingTaskVo> getPackingTask(String basketBarcode);
-	/**
-	 * 过滤相应状态的容器条码
-	 * @param barcodes 条码
-	 * @param status 状态
-	 * @param isExclude 是否排除status,true:返回传入状态以外的条码,false:返回传入状态的条码
-	 * @return 条码
-	 */
-	public Collection<String> filterStatusContainer(Collection<String> barcodes, String status, Boolean isExclude);
+	
 }