Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r28602 -r28751
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 28602)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 28751)
@@ -20,6 +20,9 @@
 	printParams.printScope.printByOriginalApplications = config.printByOriginalApplications;
 	printParams.printScope.isPrintToSendGood = config.isPrintToSendGood;
 	printParams.printScope.customProject = config.customProject;
+	if(printConfig.isMergePrint){
+		printParams.printScope.isMergePrint = printConfig.isMergePrint;
+	}
 	return printParams;
 }
 //批量打印发货计划
@@ -164,7 +167,6 @@
 		}else{
 			print(printSummaryObj);
 		}
-		
 	    if(printType == 0){//直接打印
 	        LODOP.PRINT();
 	    }else{//打印预览
@@ -298,22 +300,27 @@
  * @param isBatchPrint 是否是批量打印,如果是批量打印,将根据后台传过来的summary中的printTemplate属性重新设置formTypeOfPrinted。printTemplate的默认值为invoicePlan
  */
 function printByJsonPrintObject(printObj, msgBox, isNotSupplyRoomUser,printType,isBatchPrint){
-		var totalPageAmount = printObj.totalPageAmount;
+	var totalPageAmount = printObj.totalPageAmount;
     var count = 0;
     for (var i=0;i<printObj.data.length;i++){
     	var summary = printObj.data[i];
     	var pages = summary.pages;
     	if(isBatchPrint){
     		formTypeOfPrinted = summary.printTemplate;
-    	}
-    	for (var j=0;j<pages.length;j++){
-    		count++;
-    		if (msgBox != null){
-    			msgBox.updateProgress( count/totalPageAmount,'正在打印第' + count + '页,共' + totalPageAmount +  '页');
-    		}
-    		summary.pageIndex = j;
+		}
+		if(printType == 0){
+			for (var j=0;j<pages.length;j++){
+				count++;
+				if (msgBox != null){
+					msgBox.updateProgress( count/totalPageAmount,'正在打印第' + count + '页,共' + totalPageAmount +  '页');
+				}
+				summary.pageIndex = j;
+				printApplicationGoods(printType, summary);
+			};
+		}else {
+			summary.pageIndex = 0;
     		printApplicationGoods(printType, summary);
-    	};
+		}
     	if (!isNotSupplyRoomUser && printType == 0){
             var tousseItemIds = [];
             top.Ext4.Array.each(summary.pages, function(page){