Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r13115 -r13125
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 13115)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 13125)
@@ -576,7 +576,18 @@
   batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark);
 
 }
+function getDepartBarcodeByDepart(depart) {
+	var departBarcode = '';
+	DWREngine.setAsync(false);
 
+	SupplyRoomConfigTableManager.getDepartBarcode(depart, function(result) {
+		if (result != null) {
+			departBarcode = result;
+		}
+	});
+	DWREngine.setAsync(true);
+	return departBarcode;
+}
 function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark){
 	  if(ids == null)
 	       return;
@@ -591,7 +602,7 @@
 	  Ext.Ajax.timeout=300*000;
 	  Ext.Ajax.request({
 		  timeout: 300*000,
-	      url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadToussePrintData.do',
+	      url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadMaterialPrintData.do',
 	      params : {ids : ids},
 	      success : function(response){
 	    	  var result = Ext.decode(response.responseText);
@@ -638,7 +649,7 @@
 	if (isUndefinedOrNullOrEmpty(result.sender)) {
 		result.sender = curUserName;
 	}
-	printInvoices2(result, printType);
+	printMaterialInvoice(result, printType);
 }
 
 //查看加载材料发货单明细信息