Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
===================================================================
diff -u -r13190 -r13225
--- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 13190)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 13225)
@@ -579,7 +579,7 @@
     	        }
 }
 
-//大标签配置，100x80mm
+//大标签配置，97x70mm
 var largeLabelConfig = {
 	customPrint:printLargeLabel,
     headerContent : [
@@ -668,7 +668,7 @@
 	var borderSize = 0;
 	
 	if(markTousse){
-	   borderSize = 1;
+	   //borderSize = 1;
 	}
 	
 	var materialsAmount = materials.length;
@@ -692,9 +692,14 @@
 			fontSize = 10;
 		}
 //		alert(fontSize)
+		materialStr += "<td width='200px' style='font-size: " + fontSize + "px;'>名称</td>";
+		materialStr += "<td width='100px' style='font-size: " + fontSize + "px;'>数量</td>";
+		materialStr += "<td width='200px' style='font-size: " + fontSize + "px;'>名称</td>";
+		materialStr += "<td width='100px' style='font-size: " + fontSize + "px;'>数量</td>";
+		materialStr += "#;";
 		for (var i=0;i<materialsAmount;i++){
 			
-			if (i % 3 == 0 && i != 0) {
+			if (i % 2 == 0 && i != 0) {
 				materialStr += "#;";
 			}
 			
@@ -704,16 +709,17 @@
 //			if (material.specification != null && material.specification != ""){
 //				temp += "[" + material.specification + "]";
 //			}
-			materialStr += "<td width='101px' style='font-size: " + fontSize + "px;'>" + temp + " x " + material.count + "</td>";
+			materialStr += "<td width='200px' style='font-size: " + fontSize + "px;'>" + temp + "</td>";
+			materialStr += "<td width='100px' style='font-size: " + fontSize + "px;'>" + material.count + "</td>";
 		}
-		if (materialsAmount % 3 != 0) {
-			for (var i = 0; i < (3 - materialsAmount % 3); i++) {
+		if (materialsAmount % 2 != 0) {
+			for (var i = 0; i < (2 - materialsAmount % 2); i++) {
 				materialStr += ("<td></td>");
 			}
 		}
 		
 		if (materialStr.length > 0) {
-			materialsTab += "<table id= 'materialsTable' border=" + borderSize + " cellspacing=0 cellpadding=0 style='width: 98mm; height: 40mm;overflow:hidden'>";
+			materialsTab += "<table id= 'materialsTable' border=" + borderSize + " cellspacing=0 cellpadding=0 style='width: 60mm; height: 70mm;overflow:hidden'>";
 			var materialArray = materialStr.split("#;");
 			for (var i=0; i<materialArray.length; i++) {
 				materialsTab += "<tr>"
@@ -723,7 +729,7 @@
 		}
 		
 	}
-//	alert(materialsTab)
+	alert(materialsTab)
 	return materialsTab;
 }
 
@@ -736,33 +742,35 @@
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
 	
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","BottomMargin:0mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("0mm","0mm","RightMargin:60mm","BottomMargin:0mm", obj.name);
 	setFontSizeBold(11,1);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("6mm","5mm","50mm","10px", "装配员:"+obj.operator);
-	LODOP.ADD_PRINT_TEXT("6mm","55mm","50mm","10px", "审核员:"+obj.reviewer);
-	LODOP.ADD_PRINT_TEXT("10mm","5mm","50mm","10px", "灭菌日期:"+obj.sterilizationDate);
-	LODOP.ADD_PRINT_TEXT("10mm","55mm","50mm","10px", "失效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("15mm","1mm","30mm","10px", "操作员:"+obj.operator);
+	LODOP.ADD_PRINT_TEXT("20mm","1mm","30mm","10px", "炉号/炉次:"+obj.reviewer);
+	LODOP.ADD_PRINT_TEXT("25mm","1mm","30mm","10px", "灭菌日期:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("30mm","1mm","30mm","10px", "失效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("35mm","1mm","30mm","10px", "包装:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("40mm","1mm","30mm","10px", "核对:"+obj.validDate);
 	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_largeLabel(obj);
-	addPrintTable(tableStr,"14mm","0mm","RightMargin:0mm","42mm");
+	addPrintTable(tableStr,"0mm","40mm","RightMargin:0mm","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("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_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("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
 }
 //小标签配置，50x30mm
 var smallLabelConfig = {