Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
===================================================================
diff -u -r29026 -r33825
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 29026)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 33825)
@@ -1,5 +1,17 @@
 
 function InvoicePrintModule(grid,curUserName){
+	var isMergeRemark = false;
+	if(sstsConfig.enableApplyGoodsRemarkFunction){
+		if(printConfig.invoiceCombo && printConfig.invoiceCombo.goodsTable && printConfig.invoiceCombo.goodsTable.columns && printConfig.invoiceCombo.goodsTable.columns.length > 0){
+			var columns = printConfig.invoiceCombo.goodsTable.columns;
+			for(var i=0;i<columns.length;i++){
+				if(columns[i].dataIndex == 'remark'){
+					isMergeRemark = true;
+				}
+			}
+		}
+	}
+	
 	function refresh(){
 		if(grid){
 			if(grid.dwrReload){
@@ -42,7 +54,7 @@
 		  Ext.Ajax.request({
 			  timeout: 300*1000,
 		      url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintData.do',
-		      params : {ids : ids,type:type},
+		      params : {ids : ids,type:type,isMergeRemark:isMergeRemark},
 		      success : function(response){
 		    	  var result = Ext.decode(response.responseText);
 		    	  if(!result.success){
@@ -83,7 +95,7 @@
 		var thiz = this;
 		DWREngine.setAsync(false);
 		InvoiceTableManager.mergeLoadPrintData(
-				ids,type,function(str) {
+				ids,type,isMergeRemark,function(str) {
 			    	  var result = Ext.decode(str);
 			    	  if(!result.success){
 			    		  if(result.message){
@@ -130,7 +142,7 @@
 				
 				Ext.Ajax.request({
 					url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintDataByConfig.do',
-					params : {id : id},
+					params : {id : id,isMergeRemark:isMergeRemark},
 					success : function(response){
 						var result = Ext.decode(response.responseText);
 						mask.hide();