Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r31984 -r33824
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 31984)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 33824)
@@ -23,6 +23,20 @@
 	if(printConfig.isMergePrint){
 		printParams.printScope.isMergePrint = printConfig.isMergePrint;
 	}
+	var isMergeRemark = false;
+	if(sstsConfig.enableApplyGoodsRemarkFunction){
+		if(config.goodsTable && config.goodsTable.content && config.goodsTable.content.length > 0){
+			for(var i=0;i<config.goodsTable.content.length;i++){
+				var dataIndex = config.goodsTable.content[i].dataIndex;
+				if(dataIndex == 'remarkOfApplyGoods'){
+					isMergeRemark = true;
+				}
+			}
+		}
+	}
+	if(isMergeRemark){
+		printParams.printScope.isMergeRemark = isMergeRemark;
+	}
 	return printParams;
 }
 //批量打印发货计划
@@ -427,7 +441,6 @@
     else{
     	printParams.printScope.rowsPerPage = printConfig.invoicePlan.rowsPerPage;
     }
-    
     DWREngine.setAsync(false);
     RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
     	var obj = JSON.parse(result);