Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r38053 -r38209
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 38053)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 38209)
@@ -1547,7 +1547,7 @@
 	Ext.Ajax.request({
 		timeout: 300000,
 		url: WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadToussePrintData.do',
-		params: { ids: ids ,isMergeRemark:isMergeRemark },
+		params: { ids: ids ,isMergeRemark:isMergeRemark,isCustomPrintForeignTousse:true },
 		success: function (response) {
 			var result = Ext.decode(response.responseText);
 			if (result.success == true) {
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
===================================================================
diff -u -r33912 -r38209
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 33912)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 38209)
@@ -53,7 +53,7 @@
 		  Ext.Ajax.request({
 			  timeout: 300*1000,
 		      url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintData.do',
-		      params : {ids : ids,type:type,isMergeRemark:isMergeRemark},
+		      params : {ids : ids,type:type,isMergeRemark:isMergeRemark,isCustomPrintForeignTousse:true},
 		      success : function(response){
 		    	  var result = Ext.decode(response.responseText);
 		    	  if(!result.success){
Index: ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js
===================================================================
diff -u -r37229 -r38209
--- ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js	(.../printConfig.js)	(revision 37229)
+++ ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js	(.../printConfig.js)	(revision 38209)
@@ -1352,6 +1352,51 @@
 	}
 }
 
+//NFYY-104:批量打印发货单 - 外来器械包
+var batchPrintInvoicesOfForeignTousseConfig = {
+	headerFooter : [
+		{label : "南方医科大学南方医院消毒供应中心出库单", dataIndex : '', fontSize : 15, position : ["20","20%","99%",5]},
+		{label : "发往：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
+		{label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
+		{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]},
+		{label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["80","35%","90%",5]},
+		{label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["80","75%","90%",5]},
+		{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]},
+		{label : "领物人:", dataIndex : '', fontSize : 11, position : ["10cm","40%","90%",5]},
+		{label : "发物人:", dataIndex : '', fontSize : 11, position : ["10cm","75%","90%",5]},
+		{barcodes : [{
+			codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
+			styles : [{
+				itemNameID: 0, styleName: 'ShowBarText', styleValue: true
+				}, {
+					itemNameID: 0, styleName: 'FontSize', styleValue: 6
+				}, {
+					itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true
+				}
+			]}
+		]}
+	],
+	currentPageNumber : {label : "第#页", fontSize : 11, position : ["11cm","75%","90%",5]},
+	totalPageAmount : {label : "共&页", fontSize : 11, position : ["11cm","81%","90%",5]},
+	goodsTable :{
+		rowHeight : 20,
+		position : ["100","1%","97%","14cm"],
+		headRepeat : true,
+		columns : [
+			{header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11},
+			{header : "名称", dataIndex : 'name', width : '13%', align : 'left', fontSize : 11},
+			{header : "病人姓名", dataIndex : 'patientNames', width : '9%', align : 'left', fontSize : 11},
+			{header : "住院号/诊疗号", dataIndex : 'hospitalNumAndClinicNumber', width : '13%', align : 'left', fontSize : 11},
+			{header : "病人所属科室", dataIndex : 'ascriptionDepartments', width : '12%', align : 'left', fontSize : 11},
+			{header : "规格", dataIndex : 'specification', width : '10%', align : 'center', fontSize : 11},
+			{header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11},
+			{header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11},
+			{header : "单价", dataIndex : 'price', width : '9%', align : 'right', fontSize : 11},
+			{header : "金额", dataIndex : 'totalPrice', width : '9%', align : 'right', fontSize : 11}
+		]
+	}
+}
+
 var printConfig = {
     //发货计划单
     invoicePlan : invoicePlanPrintConfig,
@@ -1421,5 +1466,7 @@
 	//NFYY-91:批量打印发货单 - 消毒物品
 	batchPrintInvoice_disinfect:batchPrintInvoicesOfDisinfectionGoodsConfig,
 	//NFYY-91:批量打印发货单 - 高值耗材物品
-	batchPrintInvoice_expensiveGoods:batchPrintInvoiceOfExpensiveGoodsConfig
+	batchPrintInvoice_expensiveGoods:batchPrintInvoiceOfExpensiveGoodsConfig,
+	//NFYY-104:批量打印发货单 - 外来器械包
+	batchPrintInvoice_foreignTousse:batchPrintInvoicesOfForeignTousseConfig
 };
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
===================================================================
diff -u -r28558 -r38209
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 28558)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38209)
@@ -491,6 +491,26 @@
     		invoicesInfo.goods = invoicesInfo.expensiveGoods;
     		printInvoiceInfo_local(invoicesInfo, printType);
     	}
+		// NFYY-104：外来器械包 - 批量打印
+		if(invoicesInfo.foreignGoods && invoicesInfo.foreignGoods.length > 0){
+			invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices';
+			var tousseObj = printConfig['batchPrintInvoice_foreignTousse'];
+			if(!isUndefinedOrNullOrEmpty(tousseObj)){
+				invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignTousse';
+			}
+			invoicesInfo.goods = invoicesInfo.foreignGoods;
+			printInvoiceInfo_local(invoicesInfo, printType);
+		}
+		// NFYY-104：外来器械包
+		if(invoicesInfo.foreignGoodsList && invoicesInfo.foreignGoodsList.length > 0){
+			invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices';
+			var tousseObj = printConfig['batchPrintInvoice_foreignTousse'];
+			if(!isUndefinedOrNullOrEmpty(tousseObj)){
+				invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignTousse';
+			}
+			invoicesInfo.goods = invoicesInfo.foreignGoodsList;
+			printInvoiceInfo_local(invoicesInfo, printType);
+		}
     }
 	
 	//DGSDBZXYY-47 外来器械发货单打印格式优化