Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r13041 -r13289
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 13041)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 13289)
@@ -162,7 +162,16 @@
             		});
             		DWREngine.setAsync(true);
             		var barcodePaperType = jsonObj.barcodePaperType;
-            		var materials = jsonObj.result;
+            		var materials = [];
+            		for(var i = 0; i < jsonObj.result.length;++i){
+            			if(jsonObj.result[i].typeName != "一次性物品"){
+            				materials.push(jsonObj.result[i]);
+            			}else{
+            				if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods != false){
+            					materials.push(jsonObj.result[i]);
+                    		}
+            			}
+            		}
             		var printBarcodeStr = barcodes[j];
             		if(!isTraceable){//不追溯打固定条码
             			printBarcodeStr = fixedBarcode;
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
===================================================================
diff -u -r13232 -r13289
--- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 13232)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 13289)
@@ -131,60 +131,47 @@
 }
 
 var invoicePlanPrintConfig = {
-	isPrintTousse : true,
-	isPrintDisinfectGoods : true,
-    isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
-    isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
-    printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印
-    printApplyInfo : false,
-    printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
-    // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
-    // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
-    disinfectGoodsPrintMode : 2,
-    rowsPerPage : 11,
-        headerContent : [
-            // 页眉名称
-            {label : "复大中山市中医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
-            // 标题
-            {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
-            {label : "部门：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["55","2%","90%",5]},
-        	{label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["55","35%","90%",5]},
-        	{label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
-        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["80","75%","90%",5]},
-        	{label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","35%","90%",5]},
-        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]}
-        ],
-        goodsTable :{
-        	rowHeight : 25,
-        	position : ["100","1%","97%","2000"],
-        	content : [
-                {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
-                {header : "名称", dataIndex : 'goodsName', width : 340, align : 'left', fontSize : 11},
-                {header : "规格", dataIndex : 'sp', width : 185, align : 'center', fontSize : 11},
-                {header : "包装规格", dataIndex : 'packageSpec', width : 100, align : 'center', fontSize : 11},
-                {header : "单位", dataIndex : 'unit', width : 60, align : 'center', fontSize : 11},
-                {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11},
-                {header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11},
-                {header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11}
-            ]
-        },
-        footer: {
-        	fontSize : 15,
-        	content : [
-        	    {label : "<br>主管:      ", dataIndex : ''},
-        	    {label : "   领料人:", dataIndex : 'applicant'},
-        	    {label : "   发料人:", dataIndex : 'printUser'},
-        	    {label : "   发货日期:", dataIndex : 'printTime'}
-        	]
-        },
-    	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}
-					]
-				}
-    	]
+		isPrintTousse : true,
+		isPrintDisinfectGoods : true,
+	    isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
+	    isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
+	    printByOriginalApplications : false, //不合并打印情况下是否按原始单据逐份打印
+	    printApplyInfo : false,
+	    printOrder : 2, // 1:优先打印一次性物品， 2：优先打印器械包
+	    // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
+	    // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
+	    disinfectGoodsPrintMode : 2,
+	    rowsPerPage : 8,
+	        headerContent : [
+	            // 标题
+	            {label : "无菌物品领用单 ", dataIndex : 'header', fontSize : 17, position : ["0","60mm","99%",22]},
+	            {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["30","1%","90%",10]},
+	            {label : "接收部门：", dataIndex : 'depart', fontSize : 11, position : ["30","45mm","90%",5]},
+	            {label : "收物者:", dataIndex : '', fontSize : 11, position : ["30","100mm","90%",5]},
+	            {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["30","165mm","90%",5]}
+	        ],
+	        goodsTable :{
+	        	rowHeight : 25,
+	        	position : ["49","1%","99%","2000"],
+	        	content : [
+	                {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
+	                {header : "名称", dataIndex : 'goodsName', width : 280, align : 'left', fontSize : 11},
+	                {header : "规格", dataIndex : 'sp', width : 260, align : 'left', fontSize : 11},
+					{header : "申请数量", dataIndex : 'applyAmount', width : 70, align : 'center', fontSize : 11},
+					{header : "回收数量", dataIndex : 'recyclingAmount', width : 70, align : 'center', fontSize : 11}
+					//{header : "单位", dataIndex : 'unit', width : 60, align : 'left', fontSize : 11},
+	            ]
+	        },
+	        footer: {
+	        fontSize : 14,
+	        content : [
+	            {label : "回收人:", dataIndex : 'recyclingUser'},
+				{label : " 清点人:", dataIndex : 'applicant'},
+	            {label : " 发货者:", dataIndex : ''},
+	            //{label : "       收物者:", dataIndex : ''},                        
+	            {label : "       打印时间:", dataIndex : 'printTime'}
+	        ]
+	    }
 }
 var batchPrintMaterialInvoicesConfig = {
         headerFooter : [
@@ -744,39 +731,35 @@
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
 	
-	LODOP.ADD_PRINT_TEXT("3mm","1mm","40mm","60px", obj.name);
+	LODOP.ADD_PRINT_TEXT("0mm","1mm","90mm","60px", obj.name);
 	setFontSizeBold(11,1);// 设置字体
 	setAlignment('center');// 对齐
-	var base = 0;
-	if(obj.name.length > 16){
-		base = 5;
-	}
 	
-	LODOP.ADD_PRINT_TEXT((base + 15) + "mm","5mm","27mm","10px", "操作员:"+obj.operator);
-	LODOP.ADD_PRINT_TEXT((base + 19) + "mm","5mm","27mm","10px", "炉号/炉次:"+obj.frequency);
-	LODOP.ADD_PRINT_TEXT((base + 23) + "mm","5mm","27mm","10px", "灭菌日期:"+obj.sterilizationDate);
-	LODOP.ADD_PRINT_TEXT((base + 27) + "mm","5mm","27mm","10px", "失效日期:"+obj.validDate);
-	LODOP.ADD_PRINT_TEXT((base + 31) + "mm","5mm","27mm","10px", "包装:"+obj.packageTypeAbbreviation);
-	LODOP.ADD_PRINT_TEXT((base + 35) + "mm","5mm","27mm","10px", "核对:"+obj.reviewer);
+	//LODOP.ADD_PRINT_TEXT((base + 15) + "mm","5mm","27mm","10px", "操作员:"+obj.operator);
+	//LODOP.ADD_PRINT_TEXT((base + 19) + "mm","5mm","27mm","10px", "炉号/炉次:"+obj.frequency);
+	LODOP.ADD_PRINT_TEXT("5mm","5mm","27mm","10px", "灭菌日期:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("8mm","5mm","27mm","10px", "失效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("11mm","5mm","27mm","10px", "包装:"+obj.operator);
+	LODOP.ADD_PRINT_TEXT("14mm","5mm","27mm","10px", "核对:"+obj.reviewer);
 	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_largeLabel(obj);
-	addPrintTable(tableStr,"3mm","40mm","RightMargin:1mm","65mm");
+	addPrintTable(tableStr,"5mm","40mm","RightMargin:1mm","70mm");
 	setAlignment('center');// 居中对齐
 	
-	//LODOP.ADD_PRINT_TEXT("58mm","0mm","RightMargin:50mm","BottomMargin:0mm", "灭菌程序:"+obj.sterilingType);
-	//setFontSizeBold(11,1);// 设置字体
-	//setAlignment('center');// 居中对齐
-	//LODOP.ADD_PRINT_TEXT("67mm","0mm","RightMargin:50mm","BottomMargin:0mm", obj.name);
-	//setFontSizeBold(11,1);// 设置字体
-	//setAlignment('center');// 居中对齐
-	//LODOP.ADD_PRINT_TEXT("67mm","50mm","RightMargin:0mm","BottomMargin:0mm", obj.name);
-	//setFontSizeBold(11,1);// 设置字体
-	//setAlignment('center');// 居中对齐
+//	LODOP.ADD_PRINT_TEXT("19mm","0mm","43mm","3mm", "灭菌程序:"+obj.sterilingType);
+//	setFontSizeBold(7,1);// 设置字体
+//	setAlignment('center');// 居中对齐
+//	LODOP.ADD_PRINT_TEXT("32mm","0mm","43mm","3mm", obj.name);
+//	setFontSizeBold(7,1);// 设置字体
+//	setAlignment('center');// 居中对齐
+//	LODOP.ADD_PRINT_TEXT("45mm","0mm","43mm","3mm", obj.name);
+//	setFontSizeBold(7,1);// 设置字体
+//	setAlignment('center');// 居中对齐
 	
-	//LODOP.ADD_PRINT_BARCODE("57mm","55mm","40mm","8mm","128Auto", obj.barcode);// 条码1
-	//LODOP.ADD_PRINT_BARCODE("71mm","5mm","40mm","8mm","128Auto", obj.barcode);// 条码2
-	//LODOP.ADD_PRINT_BARCODE("71mm","55mm","40mm","8mm","128Auto", obj.barcode);// 条码3
+	LODOP.ADD_PRINT_BARCODE("22mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码1
+//	LODOP.ADD_PRINT_BARCODE("35mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码2
+//	LODOP.ADD_PRINT_BARCODE("48mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码3
 }
 //小标签配置，50x30mm
 var smallLabelConfig = {
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
===================================================================
diff -u -r13159 -r13289
--- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js	(.../config.js)	(revision 13159)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js	(.../config.js)	(revision 13289)
@@ -51,5 +51,7 @@
   //入库单是否显示发票
   godownEntryShowInvoice:true,
   //入库单是否显示生物检测信息
-  godownEntryShowBiologicalTestReport:true
+  godownEntryShowBiologicalTestReport:true,
+  //打印标签中的材料时，是否打印一次性物品
+  tousseLabelPrintDisposableGoods:false
 }
\ No newline at end of file