Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r32515 -r32546
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 32515)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 32546)
@@ -1638,10 +1638,15 @@
 					String [] basketBarcodesOfitemVo = basketBarcodesStrOfitemVo.split(";");
 					String msg = "";
 					for (int i = 0; i < basketBarcodesOfitemVo.length; i++) {
-						if(basketBarcode.equals(basketBarcodesOfitemVo[i]) || unWashedClassifyBasketMap.containsKey(basketBarcodesOfitemVo[i])){
-							continue;//不查询扫描的条码和已经查询过的条码
+						if(basketBarcode.equals(basketBarcodesOfitemVo[i])){
+							continue;//不查询扫描的条码
 						}
-						ClassifyBasket unAWashedClassifyBasket = classifyBasketManager.getUnWashedAndTousseItemUnEndBasket(basketBarcodesOfitemVo[i], task.getTaskType(), task.getSourceId());
+						ClassifyBasket unAWashedClassifyBasket = null;
+						if(unWashedClassifyBasketMap.containsKey(basketBarcodesOfitemVo[i])){
+							unAWashedClassifyBasket = unWashedClassifyBasketMap.get(basketBarcodesOfitemVo[i]);
+						}else{
+							unAWashedClassifyBasket = classifyBasketManager.getUnWashedAndTousseItemUnEndBasket(basketBarcodesOfitemVo[i], task.getTaskType(), task.getSourceId());
+						}
 						if(unAWashedClassifyBasket != null){
 							unWashedClassifyBasketMap.put(unAWashedClassifyBasket.getContainerBarcode(), unAWashedClassifyBasket);
 							if(StringUtils.isNotBlank(msg)){
@@ -1652,7 +1657,15 @@
 					}
 					//例子:清洗篮筐测试7141;测试7142临床大镊子包所在的清洗篮筐测试7141;测试7142    还未完成清洗，需要完成清洗后才能装配！
 					if(StringUtils.isNotBlank(msg)){
-						msg = "【"+ tousseName + "】所在的" + msg;
+						String tousseNameStr = null;
+						if(StringUtils.isNotBlank(task.getIdNumber())){
+							tousseNameStr = tousseName + "-" + task.getIdNumber();
+						}else if(StringUtils.isNotBlank(task.getIdCardBarcode())){
+							tousseNameStr = tousseName + "-" + task.getIdCardBarcode();
+						}else{
+							tousseNameStr = tousseName;
+						}
+						msg = "【"+ tousseNameStr + "】所在的" + msg;
 						if(StringUtils.isNotBlank(notWashedInfo)){
 							notWashedInfo += ",";
 						}