Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r32862 -r32863
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32862)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32863)
@@ -3452,7 +3452,7 @@
     return result;
 }
 //打印材料清单(包含了装配页面,聚合包页面,器械包定义页面)
-function printTousseDefinitionMaterial(ids, printBOMwhenPrintLabel, lists) {
+function printTousseDefinitionMaterial(ids, printBOMwhenPrintLabel, lists, isPrint, pageSoure) {
     var printLabel = printBOMwhenPrintLabel || false;
     TousseDefinitionTableManager.getTousseDefinition(ids, printLabel, function (jsonStr) {
         var result = JSON.parse(jsonStr);
@@ -3463,7 +3463,7 @@
                 currentDateTime = currentDateTime.split(' ')[0];
             }
             if (tousses != null && tousses.length > 0) {
-                if (sstsConfig.printBOMwhenPrintLabel && printBOMwhenPrintLabel) {
+                if (sstsConfig.printBOMwhenPrintLabel && pageSoure == 'packingView') {
                     Ext.MessageBox.progress('打印中', '请稍候...');
                     var curNumber = 0;
                     if (lists) {
@@ -3478,7 +3478,7 @@
                                         toussedef.currentDateTime = currentDateTime;
                                         ++curNumber;
                                         Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                                        printTousseDefinitionMaterialsInTousseView(toussedef, 0, 'BOMprinter');
+                                        printTousseDefinitionMaterialsInTousseView(toussedef, isPrint, 'BOMprinter');
                                     }
                                 }
                             }
@@ -3490,7 +3490,7 @@
                             toussedef.currentDateTime = currentDateTime;
                             ++curNumber;
                             Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                            printTousseDefinitionMaterialsInTousseView(toussedef, 0, 'BOMprinter');
+                            printTousseDefinitionMaterialsInTousseView(toussedef, isPrint, 'BOMprinter');
                         }
                     }
                     hideMessageBox(false);
@@ -3513,11 +3513,7 @@
                                             toussedef.currentDateTime = currentDateTime;
                                             ++curNumber;
                                             Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                                            if(printBOMwhenPrintLabel){
-                                                printTousseDefinitionMaterialsInTousseView(toussedef, 1);
-                                            }else {
-                                                printTousseDefinitionMaterialsInTousseView(toussedef, 0);
-                                            }
+                                            printTousseDefinitionMaterialsInTousseView(toussedef, isPrint);
                                         }
                                     }
                                     hideMessageBox(false);
@@ -4336,7 +4332,7 @@
 }
 
 //整合清洗机打印
-function print_commonFun(barcode, name, unitName, printType,viewType) {
+function print_commonFun(barcode, name, unitName, printType, viewType) {
     var obj = {
         barcode: barcode,
         name: name,