Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
===================================================================
diff -u -r18270 -r19658
--- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js	(.../printConfig.js)	(revision 18270)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js	(.../printConfig.js)	(revision 19658)
@@ -1028,7 +1028,115 @@
 	setFontSizeBold(10,0);// 设置字体
 	setAlignment('center');// 对齐
 }
+var largeLabel2Config = {
+		customPrint:printLargeLabel2
+}
 
+function printLargeLabel2(obj){
+	doGetLodop();
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('6.5mm','0mm','6.5mm','100mm',0,1);
+		LODOP.ADD_PRINT_LINE('15mm','0mm','15mm','100mm',0,1);
+	}
+	// 设置默认字体
+	setDefaultFontNameSizeBold('宋体',10,1);
+	// 默认条码属性
+	LODOP.SET_PRINT_STYLE('ShowBarText', true);
+	LODOP.SET_PRINT_STYLE('FontSize', 6);
+	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+	
+	var size = 11;
+	if (obj.name.length >15){
+		size = 7;
+	}
+	
+	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","BottomMargin:0mm", obj.name);
+	setFontSizeBold(15,1);// 设置字体
+	setAlignment('center');// 对齐
+	var curDate = new Date();
+	var packingDateTime = date2string(curDate)
+	packingDateTime = packingDateTime.substring(0,16);
+	
+	LODOP.ADD_PRINT_TEXT("7mm","60mm","50mm","8px", "装配员:"+obj.operator);
+	setFontSizeBold(10,1);// 设置字体
+	LODOP.ADD_PRINT_TEXT("11mm","60mm","50mm","8px", "审核员:"+obj.reviewer);
+	setFontSizeBold(10,1);// 设置字体
+	LODOP.ADD_PRINT_TEXT("7mm","5mm","50mm","8px", "灭菌日期:"+obj.sterilizationDate);
+	setFontSizeBold(10,1);// 设置字体
+	
+//		LODOP.ADD_PRINT_TEXT("11mm","2mm","70mm","8px", "配包时间:" + packingDateTime);
+//		setFontSizeBold(10,1);// 设置字体
+	
+	LODOP.ADD_PRINT_TEXT("11mm","5mm","50mm","8px", "失效日期:"+obj.validDate);
+	setFontSizeBold(10,1);// 设置字体
+	
+	// 打印表格
+	var tableStr = getMaterialsTabHtml_largeLabel(obj);
+	addPrintTable(tableStr,"15mm","2mm","RightMargin:0mm","44mm");
+	setAlignment('center');// 居中对齐
+	
+	LODOP.ADD_PRINT_TEXT("67mm","0mm","RightMargin:50mm","BottomMargin:0mm", obj.name);
+	setFontSizeBold(size,1);// 设置字体
+	setAlignment('center');// 居中对齐
+	LODOP.ADD_PRINT_TEXT("67mm","50mm","RightMargin:0mm","BottomMargin:0mm", obj.name);
+	setFontSizeBold(size,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
+	
+	var hospitalName = obj.hospitalName;
+	
+	var sterilizerStr = "";
+	var sterilizer = obj.sterilizer;
+	var frequency = obj.frequency;
+	var fontSize = 10;
+	
+	if(sterilizer == null || sterilizer.length == 0){
+		LODOP.ADD_PRINT_TEXT("58mm","0mm","RightMargin:50mm","BottomMargin:0mm", hospitalName);
+	}else{
+		if (sterilizer.length < 10){
+			sterilizer = "【"+sterilizer + "】";
+		}
+		else{
+			fontSize = 8;
+			sterilizer = "【"+sterilizer + "】";
+		}
+		
+		LODOP.ADD_PRINT_TEXT("56mm","0mm","RightMargin:50mm","BottomMargin:0mm", sterilizer);
+		setFontSizeBold(fontSize,1);// 设置字体
+		setAlignment('center');// 居中对齐
+		LODOP.ADD_PRINT_TEXT("61mm","0mm","RightMargin:50mm","BottomMargin:0mm", "第" + frequency +"炉");
+	}
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 居中对齐
+	
+	// 包装方式简称1
+	LODOP.ADD_PRINT_TEXT("57mm","51mm","4mm","8mm", obj.packageTypeAbbreviation);
+	setFontSizeBold(10,0);// 设置字体
+	setAlignment('center');// 对齐
+	// 包装方式简称2
+	LODOP.ADD_PRINT_TEXT("71mm","1mm","4mm","8mm", obj.packageTypeAbbreviation);
+	setFontSizeBold(10,0);// 设置字体
+	setAlignment('center');// 对齐
+	// 包装方式简称3
+	LODOP.ADD_PRINT_TEXT("71mm","51mm","4mm","8mm", obj.packageTypeAbbreviation);
+	setFontSizeBold(10,0);// 设置字体
+	setAlignment('center');// 对齐
+	
+	var img1 = "<img src='" + WWWROOT + "/disinfectsystem/config/gzspyqzyy/img/lightcaving.jpg'/>";
+//	img1 = "<img src='" + WWWROOT + "/disinfectsystem/config/gzfdzl/img/123.jpg'/>";
+//	img1 = "<img src='" + WWWROOT + "/disinfectsystem/config/gzspyqzyy/img/123.jpg'/>";
+//	img1 = "<img src='" + WWWROOT + "/disinfectsystem/config/gzfdzl/img/logo.jpg'/>";
+//	LODOP.ADD_PRINT_IMAGE("36mm","30mm","20mm","22mm",img1);
+//	LODOP.SET_PRINT_STYLEA(0, 'Stretch', 1);
+	LODOP.ADD_PRINT_HTM("42mm","40mm","20mm","22mm",img1);
+}
+
 //外来器械包大标签
 var foreignTousseLargeLabelConfig = {
 		customPrint:printForeignTousseLabelLable,
@@ -1419,6 +1527,8 @@
 //    middleLable : exLargeLabelConfig,
     // 大标签:100x80规格
     largeLabel : largeLabelConfig,
+    // 大标签2
+    largeLabel2 : largeLabel2Config,
     // 加大标签:100x100规格
     exLargeLabel : exLargeLabelConfig,
     // 外部代理灭菌标签
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/img/lightcaving0.jpg
===================================================================
diff -u
Binary files differ
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
===================================================================
diff -u -r19521 -r19658
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 19521)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 19658)
@@ -167,6 +167,7 @@
 			}else{
 				nameList.add("加大标签");
 				nameList.add("大标签");
+				nameList.add("大标签2");
 				nameList.add("中标签");
 				nameList.add("中标签2");
 				nameList.add("小标签");
@@ -175,6 +176,7 @@
 		}else{
 			nameList.add("加大标签");
 			nameList.add("大标签");
+			nameList.add("大标签2");
 			nameList.add("中标签");
 			nameList.add("中标签2");
 			nameList.add("小标签");
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r19293 -r19658
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 19293)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 19658)
@@ -962,8 +962,9 @@
 	var formType = '';
 	if(pageType == "加大标签"){
 		formType = "exLargeLabel";
-	}
-	else if(pageType == "大标签"){
+	}else if(pageType == "大标签2"){
+		formType = "largeLabel2";
+	}else if(pageType == "大标签"){
 		formType = "largeLabel";
 	}else if(pageType == "中标签"){ //需要改造，调用print(obj)进行打印
 		formType = "middleLable";
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/img/lightcaving.jpg
===================================================================
diff -u
Binary files differ