Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r30798 -r30799
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30798)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30799)
@@ -1,7 +1,6 @@
 Ext4.require('Ext4.tab.*');
 Ext4.require(['Ext4.data.*', 'Ext4.grid.*']);
 var basketColumnTreeGrid;
-var basketBarcodeArr2 = [];
 var splitForeignTousseFlag = false;//拆包
 //记住最后选择的器械包图片名称、类型、视频名称、包定义id;用于查看材料图片后再次查询器械包
 var lastSelectTousseName;
@@ -3774,26 +3773,12 @@
 		 //格式[{tousseName:"",amount:1,packed:true,taskItems:[{taskId:11,amount:20},{taskId:12,amount:30}]},{tousseName:"",amount:1,packed:true,taskItems:[{taskId:11,amount:20},{taskId:12,amount:30}]}]
 		 // 一次打印
 		printLabelsAfterPacking();
-		 //删除篮筐内物品
-		 var rootNode = Ext4.getCmp('basketTreeGrid').getStore().getRootNode();
-		 var basketBarcodeArr = [];
-		 if(rootNode.childNodes.length > 0){
-			 for(var i=0;i<rootNode.childNodes.length;i++){
-				 var data = rootNode.childNodes[i];
-				 for(var j=0;j<data.childNodes.length;j++){
-					 var childData = data.childNodes[j];
-					 var basketBarcode = childData.data.basketBarcode;
-					 if(basketBarcodeArr.indexOf(basketBarcode) == -1){
-						 basketBarcodeArr.push(basketBarcode)
-					 }
-				 }
-			 }
-			 Ext4.getCmp('basketTreeGrid').getStore().reload();
-			 if(basketBarcodeArr.length > 0){
-				 for(var z=0;z<basketBarcodeArr.length;z++){
-					 scanBasketBarcodes(basketBarcodeArr[z],2);
-				 }
-			 }
+		 //刷新篮筐内物品
+		 var basketBarcodeArr = getBasketBarcode();
+		 if(basketBarcodeArr.length > 0){
+			for(var z=0;z<basketBarcodeArr.length;z++){
+				scanBasketBarcodes(basketBarcodeArr[z],2);
+			}
 		 }else {
 			 Ext4.getCmp('basketTreeGrid').getStore().reload();
 		 }
@@ -4850,7 +4835,6 @@
 	                        showResult('篮筐条码为空' , null , sstsConfig.messagePauseTimeOnPackingPage);
 	                        return;
 	                    }
-						basketBarcodeArr2.push(basketBarcode);
 	                    scanBasketBarcodes(basketBarcode,1);
 	                }
 	            });
@@ -5539,9 +5523,31 @@
 function websocketCallBack(){
 	pageLoad = true;
 }
+
+//获取篮筐内的条码
+function getBasketBarcode(){
+	var rootNode = Ext4.getCmp('basketTreeGrid').getStore().getRootNode();
+	var basketBarcodeArr = [];
+	if(rootNode.childNodes.length > 0){
+		for(var i=0;i<rootNode.childNodes.length;i++){
+			var data = rootNode.childNodes[i];
+			for(var j=0;j<data.childNodes.length;j++){
+				var childData = data.childNodes[j];
+				var basketBarcode = childData.data.basketBarcode;
+				if(basketBarcodeArr.indexOf(basketBarcode) == -1){
+					basketBarcodeArr.push(basketBarcode);
+				}
+			}
+		}
+	}
+
+	return basketBarcodeArr;
+}
+
+
 function websocketCallBacks(){
 	//刷新装配和待装配任务列表(须参考需求的预期结果进行前端业务的开发:ZSWY-110 多人同时进行装配和审核时界面上的待处理任务要自动实时刷新)
-	var basketBarcodeArrAll = basketBarcodeArr2;
+	var basketBarcodeArrAll = getBasketBarcode();
 	if(basketBarcodeArrAll.length > 0){
 		Ext4.getCmp('basketTreeGrid').getStore().reload();
 		if(!splitForeignTousseFlag){