Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r13895 -r13930
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13895)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13930)
@@ -1324,7 +1324,6 @@
 	 * @return 同时返回PackingTask和TousseDefintion两个实体类，避免多次查询
 	 */
 	private List<Object[]> findPackingTaskFromCssdHandleToussesConfig(String taskGroup,String basketBarcode) {
-		List<Object[]> queryResult = new ArrayList<Object[]>();
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,"
 				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
@@ -1333,15 +1332,14 @@
 				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 ";
 		if(StringUtils.isNotBlank(basketBarcode)){
 			//验证篮筐是否清洗
-			Container basket = containerManager
-					.getContainerByBarcode(basketBarcode);
+			Container basket = containerManager.getContainerByBarcode(basketBarcode);
 			if(basket == null){
 				throw new RuntimeException(String.format("未找到条码为%s的篮筐", basketBarcode));
 			}
-			String status = basket
-					.getStatus();
-			if (!Container.CONTAINER_STATUS_WASHED.equals(status)) {
-				throw new RuntimeException(String.format("只能扫描清洗完成的篮筐,该篮筐状态为%s!",status));
+			String status = basket.getStatus();
+			if (Container.CONTAINER_STATUS_WASHLOADING.equals(status)
+					|| Container.CONTAINER_STATUS_WASHING.equals(status)) {
+				throw new RuntimeException(String.format("请扫描清洗完成的篮筐,该篮筐状态为%s!",status));
 			}
 			sql += " and po.basketBarcode like '%" + basketBarcode + "%' ";
 		}
@@ -1356,7 +1354,6 @@
 	 * @return 同时返回PackingTask和TousseDefintion两个实体类，避免多次查询
 	 */
 	private List<Object[]> findForeignToussePackingTask(String basketBarcode) {
-		List<Object[]> queryResult = new ArrayList<Object[]>();
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,"
 				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
@@ -1366,12 +1363,12 @@
 			//验证篮筐是否清洗
 			Container basket = containerManager
 					.getContainerByBarcode(basketBarcode);
-			String status = basket
-					.getStatus();
-			if (basket != null
-					&& Container.CONTAINER_STATUS_WASHLOADING.equals(status)
-					|| Container.CONTAINER_STATUS_WASHING.equals(status)) {
-				return null;
+			if (basket != null) {
+				String status = basket.getStatus();
+				if (Container.CONTAINER_STATUS_WASHLOADING.equals(status)
+						|| Container.CONTAINER_STATUS_WASHING.equals(status)) {
+					return null;
+				}
 			}
 			sql += " and po.basketBarcode like '%" + basketBarcode + "%' ";
 		}