Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32422 -r32426
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32422)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32426)
@@ -2899,7 +2899,6 @@
 	else{
 		packButton.setText('<span style="font-weight: bold;">装配不追溯' + tousseType + '</span>');
 	}
-
 	if(showOrHidePrintBtn == '是'){
 		packButton.setText('<span style="font-weight: bold;">装配打印标签和材料清单</span>');
 	}
@@ -4335,7 +4334,7 @@
 	var len = params.length;
 	if(index == len){
 		if(isTrue){
-			printLabelsAfterPacking();
+			printLabelsAfterPacking(params);
 			//刷新篮筐内物品
 			reloadBasketTreeGrid();
 			var basketTree = Ext4.getCmp('basketTreeGrid');
@@ -4354,7 +4353,7 @@
 		}else {
 			// 一次打印
 			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-			printLabelsAfterPacking();
+			printLabelsAfterPacking(params);
 			waitPackingTreeGrid.getStore().reload();
 			showScanIDCardBarcode();
 		}
@@ -4455,7 +4454,7 @@
 		
 	}
 }
-function printLabelsAfterPacking(){
+function printLabelsAfterPacking(params){
 	if(!packing){
 		return;
 	}
@@ -4492,15 +4491,14 @@
 			});
 		}
 		DWREngine.setAsync(true);
-
 		//SZSDSRMYY-68:打印材料清单
 		if(sstsConfig.printBOMwhenPrintLabel){
 			var ids = [];
 			for(var i=0;i<tousseesToPrint.length;i++){
 				ids[i] = tousseesToPrint[i].tousseDefinitionId;
 			}
 			if(ids.length > 0){
-				printTousseDefinitionMaterial(ids.join(';'));
+				printTousseDefinitionMaterial(ids.join(';'),params);
 			}
 		}
 	}
@@ -4956,7 +4954,6 @@
 	}else if(record.childNodes.length == 0){
 		taskId = record.get('taskId');
 	}
-	console.log(record)
 	if(record.get('checked') == false){
 		record.set('checked', true);
 		if(storeId == 'basketTreeGrid'){
@@ -5035,7 +5032,7 @@
 }
 
 //SSTS-377：是否显示打印标签的按钮
-function showOrHidePrintBtn(showOrHidePrintBtn){
+function showOrHidePrintBtn(){
 	var basketTreeId = Ext4.getCmp('basketTreeGrid');
 	var basketTreeList = basketTreeId.getView().getChecked();
 	var waitPackingTreeId = Ext4.getCmp('waitPackingTreeGrid');
@@ -5044,22 +5041,38 @@
 		var isPrint = basketTreeList[0].get('isPrint');
 		var isReview = basketTreeList[0].get('isReview');
 		var tousseType = basketTreeList[0].get('tousseType');
-		showPackButton(isPrint,isReview,tousseType,showOrHidePrintBtn);
+		var printBOMwhenPrintLabel = '否';
+		if(sstsConfig.printBOMwhenPrintLabel){
+			if(basketTreeList[0].childNodes.length > 0){
+				printBOMwhenPrintLabel = basketTreeList[0].childNodes[0].raw.printBOMwhenPrintLabel || '否';
+			}else {
+				printBOMwhenPrintLabel = basketTreeList[0].raw.printBOMwhenPrintLabel || '否';
+			}
+		}
+		showPackButton(isPrint,isReview,tousseType,printBOMwhenPrintLabel);
 	}else {
 		if(waitPackingTreeList.length > 0){
 			var isPrint;
 			var isReview;
 			var tousseType;
+			var printBOMwhenPrintLabel = '否';
 			for(var i=0;i<waitPackingTreeList.length;i++){
 				var taskType = waitPackingTreeList[i].get('taskType');
 				if(taskType != taskType_recyclingRecord){
 					isPrint = waitPackingTreeList[i].get('isPrint') || '';
 					isReview = waitPackingTreeList[i].get('isReview') || '';
 					tousseType = waitPackingTreeList[i].get('tousseType') || '';
 				}
+				if(sstsConfig.printBOMwhenPrintLabel){
+					if(waitPackingTreeList[i].childNodes.length > 0){
+						printBOMwhenPrintLabel = waitPackingTreeList[i].childNodes[0].raw.printBOMwhenPrintLabel || '否';
+					}else {
+						printBOMwhenPrintLabel = waitPackingTreeList[i].raw.printBOMwhenPrintLabel || '否';
+					}
+				}
 			}
 			if(isPrint){
-				showPackButton(isPrint, isReview, tousseType,showOrHidePrintBtn);
+				showPackButton(isPrint, isReview, tousseType,printBOMwhenPrintLabel);
 			}else {
 				Ext4.getCmp('save_print').hide();
 				Ext4.getCmp('packingLableBtn').hide();
@@ -5183,15 +5196,7 @@
 			itemClickFunction(record,'basketTreeGrid',index);
 			setTimeout(function(){
 				updatePackageType('basketTreeGrid');
-				var printBOMwhenPrintLabel = '否';
-				if(sstsConfig.printBOMwhenPrintLabel){
-					if(record.childNodes.length > 0){
-						printBOMwhenPrintLabel = record.childNodes[0].raw.printBOMwhenPrintLabel || '否';
-					}else {
-						printBOMwhenPrintLabel = record.raw.printBOMwhenPrintLabel || '否';
-					}
-				}
-				showOrHidePrintBtn(printBOMwhenPrintLabel);
+				showOrHidePrintBtn();
 				if(sstsConfig.enablePackingMaterialsCheckFunction){
 					getPackingMaterialsForCheckFun(record);
 				}
@@ -5400,15 +5405,7 @@
 			itemClickFunction(record,'waitPackingTreeGrid',index);
 			setTimeout(function(){
 				updatePackageType('waitPackingTreeGrid');
-				var printBOMwhenPrintLabel = '否';
-				if(sstsConfig.printBOMwhenPrintLabel){
-					if(record.childNodes.length > 0){
-						printBOMwhenPrintLabel = record.childNodes[0].raw.printBOMwhenPrintLabel || '否';
-					}else {
-						printBOMwhenPrintLabel = record.raw.printBOMwhenPrintLabel || '否';
-					}
-				}
-				showOrHidePrintBtn(printBOMwhenPrintLabel);
+				showOrHidePrintBtn();
 				if(sstsConfig.enablePackingMaterialsCheckFunction){
 					if(record.data.tousseType == '敷料包' || record.data.taskType == 3){
 						getPackingMaterialsForCheckFun(record);
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r32381 -r32426
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32381)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32426)
@@ -3451,7 +3451,7 @@
     return result;
 }
 //打印材料清单(包含了装配页面,聚合包页面,器械包定义页面)
-function printTousseDefinitionMaterial(ids) {
+function printTousseDefinitionMaterial(ids,lists) {
     TousseDefinitionTableManager.getTousseDefinition(ids, function (jsonStr) {
         var result = JSON.parse(jsonStr);
         if (result.success) {
@@ -3464,13 +3464,32 @@
                 if(sstsConfig.printBOMwhenPrintLabel){
                     Ext.MessageBox.progress('打印中', '请稍候...');
                     var curNumber = 0;
-                    var count = tousses.length;
-                    for (var i = 0; i < tousses.length; i++) {
-                        var toussedef = tousses[i];
-                        toussedef.currentDateTime = currentDateTime;
-                        ++curNumber;
-                        Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                        printTousseDefinitionMaterialsInTousseView(toussedef, 0,'BOMprinter');
+                    if(lists){
+                        for(var k=0;k<lists.length;k++){
+                            var packAmount = lists[k].packAmount;
+                            var tousseName = lists[k].tousseName;
+                            var count = Number(packAmount) * tousses.length;
+                            for (var j = 0; j < Number(packAmount); j++) {
+                                for (var i = 0; i < tousses.length; i++) {
+                                    var toussedef = tousses[i];
+                                    if(tousseName == toussedef.name){
+                                        toussedef.currentDateTime = currentDateTime;
+                                        ++curNumber;
+                                        Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
+                                        printTousseDefinitionMaterialsInTousseView(toussedef, 0,'BOMprinter');
+                                    }
+                                }
+                            }
+                        }
+                    }else {
+                        var count = tousses.length;
+                        for (var i = 0; i < tousses.length; i++) {
+                            var toussedef = tousses[i];
+                            toussedef.currentDateTime = currentDateTime;
+                            ++curNumber;
+                            Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
+                            printTousseDefinitionMaterialsInTousseView(toussedef, 0,'BOMprinter');
+                        }
                     }
                     hideMessageBox(false);
                 }else {