Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r28694 -r28751
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 28694)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 28751)
@@ -2095,8 +2095,8 @@
 					//如需打印看效果需要 设一下 repeat = true;
 					printParams.printScope.reprintTodayPrintedTousseItem = repeat;
 				    RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
-				    	var obj = JSON.parse(result);
-				    	//如果批量打印发货计划的版本为1时
+						var obj = JSON.parse(result);
+						//如果批量打印发货计划的版本为1时
 						if(sstsConfig.batchPrintInvoicePlanVersion == 1){
 							commonEquipmentDeliveryPlanList(obj);
 							if (!isIE6OrIE7){
@@ -2125,9 +2125,12 @@
 								progress:true,
 								closable:false
 							});
-
 							formTypeOfPrinted = "invoicePlan";
-							printByJsonPrintObject(obj, newP,false,0,true);
+							if(printConfig.isMergePrint){
+								printByJsonPrintObject(obj, newP,false,1,true);
+							}else {
+								printByJsonPrintObject(obj, newP,false,0,true);
+							}
 				    	}
 				    	else{
 				    		showResult(obj.message);