Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r33488 -r33825
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 33488)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 33825)
@@ -1486,11 +1486,22 @@
 		progress: true,
 		closable: false
 	});
+	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;
+				}
+			}
+		}
+	}
 	Ext.Ajax.timeout = 300 * 000;
 	Ext.Ajax.request({
 		timeout: 300 * 000,
 		url: WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadToussePrintData.do',
-		params: { ids: ids },
+		params: { ids: ids ,isMergeRemark:isMergeRemark },
 		success: function (response) {
 			var result = Ext.decode(response.responseText);
 			if (result.success == true) {