Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r29533 -r29543
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29533)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29543)
@@ -3625,7 +3625,7 @@
 		 //删除篮筐内物品
 		 Ext4.getCmp('basketTreeGrid').getStore().reload();
 		 if(basketBarcodeArr2.length > 0){
-			scanBasketBarcodes(basketBarcodeArr2[basketBarcodeArr2.length-1]);
+			scanBasketBarcodes(basketBarcodeArr2[basketBarcodeArr2.length-1],2);
 		 }
 		//打印后去掉选中的钩
 		if(selLength > 0){
@@ -4210,8 +4210,8 @@
     }
 }
 
-//扫描篮筐条码
-function scanBasketBarcodes(basketBarcode){
+//扫描篮筐条码,装配完成之后重新扫描条码不提示
+function scanBasketBarcodes(basketBarcode,scanType){
 	var myMask = new Ext4.LoadMask({msg:"正在加载，请稍候...",target:Ext4.getCmp('basketTreeGrid')});
 	myMask.show();
 	Ext4.Ajax.request({
@@ -4231,11 +4231,13 @@
 			var taskList = jsonObj.data;
 			var nLength = taskList?taskList.length:0;
 			
-			if(jsonObj.notWashedInfo !== ''){
-				showResult(jsonObj.notWashedInfo);
-			}else {
-				if(nLength == 0){
-					showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+			if(scanType == 1){
+				if(jsonObj.notWashedInfo !== ''){
+					showResult(jsonObj.notWashedInfo);
+				}else {
+					if(nLength == 0){
+						showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+					}
 				}
 			}
 			
@@ -4574,7 +4576,7 @@
 	                        return;
 	                    }
 						basketBarcodeArr2.push(basketBarcode);
-	                    scanBasketBarcodes(basketBarcode);
+	                    scanBasketBarcodes(basketBarcode,1);
 	                }
 	            });
 	        }