Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r15987 -r15996
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 15987)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 15996)
@@ -3,6 +3,7 @@
 
 var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
 var packedToussesArray = [];// 用于一次打印所有装配的包
+var tousseesToPrint = [];
 var formPanel;
 var deletePackingTask;
 var showTousseDamageMaterial;
@@ -1199,6 +1200,7 @@
 				
 				packingToussesArray = []; // 清除所装配的器械包数组
 				packedToussesArray = [];
+				tousseesToPrint = [];
 				
 				// 首先处理标识牌的打印
 				var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
@@ -1315,7 +1317,7 @@
 						 packingTousse(false,basketBarcode,taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
 					});
 					// 一次打印
-					doPrintLabels(packedToussesArray);
+					printLabelsAfterPacking();
 					 //删除篮筐内物品
 					deleteBasketItems(delBasketItems);
 					//打印后去掉选中的钩
@@ -1394,7 +1396,7 @@
 	               		
 	               		});
 	               		// 一次打印
-						doPrintLabels(packedToussesArray);
+	               		printLabelsAfterPacking();
 	               		waitPackingTreeGrid.getStore().reload();
                    }else{
                       showResult('请选择要打印的行!');
@@ -1937,11 +1939,12 @@
  	var department = taskNode.get("department");
  	var urgentAmount = taskNode.get("urgentAmount");
 	// 装配
-    packed = packingTousse(true,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount);
+    packed = packingTousse(false,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount);
     if(packed){
     	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1);
     }
-    
+    // 一次打印
+	printLabelsAfterPacking();
  	// 删除篮筐物品
 	deleteBasketItems(tousseItemsToDelete);
 	//刷新待装配列表
@@ -2132,7 +2135,6 @@
 function processAfterPacking(printImmediately,result, showName, packAmount){
 	
 	var tousses = result.tousses;
-	
 	packingToussesArray = packingToussesArray.concat(tousses);
 	packedToussesArray = packedToussesArray.concat(tousses);
 	
@@ -2147,6 +2149,15 @@
 		isPrintLabelNow = false;
 	}
 	
+//	for(var i=0;i<tousses.length;++i){
+//		if(tousses[i].isPrint){
+//			continue;
+//		}
+//		if(sstsConfig.printLabelWhenReviewing && tousses[i].isReview){
+//			continue;
+//		}
+//		tousseesToPrint.push(tousses[i]);
+//	}
 	// 现在不打印标签
 	if (isPrintLabelNow == false ){
 		showResult(packAmount + "个" + showName + "装配完成");
@@ -2155,9 +2166,10 @@
 	else{
 		// 该物品的器械包定义是否需要打印标签
 		if (isPrint){
-			if(printImmediately){
-				doPrintLabels(tousses);
-			}
+//			if(printImmediately){
+//				doPrintLabels(tousses);
+//			}
+			tousseesToPrint = tousseesToPrint.concat(tousses);
 		}
 		else{
 			showResult(packAmount + "个" + showName + "装配完成，该物品设置为不打印条码标签！");
@@ -2166,7 +2178,13 @@
 	}
 	Ext4.getCmp("idCardBarcode").setValue('');
 }
-
+function printLabelsAfterPacking(){
+	var packAmount = packedToussesArray.length;
+//	showResult(packAmount + "个" + showName + "装配完成");
+	if(tousseesToPrint.length > 0){
+		doPrintLabels(tousseesToPrint);
+	}
+}
 // 添加要删除的项
 function setTousseItemsToDelete(tousseItemsToDelete,tousseName){
 	var tousseItem = {};