Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r33271 -r33352
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 33271)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 33352)
@@ -1366,22 +1366,14 @@
 		LODOP.SET_PRINTER_INDEX(-1);// TODO 可增加切换打印机的处理
 		CreateOneFormPage(barcode,name,unitName);
 		LODOP.PRINT();
-		if (LODOP.CVERSION) {
-			CLODOP.On_Return=function(TaskID,Value){
-				if(Value){
-					//已发出实际打印命令
-				}else {
-					//没有发出实际打印命令！重试打印
-					var newTime = time || 1;
-					if(newTime < 4){
-						newTime ++ ;
-						defaultPrint(barcode,name,unitName,newTime);
-					}else {
-						showResult('标签打印命令发送不成功，请检查网络以及打印机是否连接正常，然后在历史装配记录中重新打印！');
-					}
-				}
-			};
-		};
+		var obj = {
+			barcode:barcode,
+			name:name,
+			unitName:unitName,
+			time:time,
+			printMode:1
+		}
+		resetPrint(obj)
 	} else {
 		alert("打印内容为空");
 	}
@@ -1575,22 +1567,9 @@
 		if(isUndefinedOrNull(obj.noPrinting)){
 			LODOP.PRINT();
 		}
-		if (LODOP.CVERSION) {
-			CLODOP.On_Return=function(TaskID,Value){
-				if(Value){
-					//已发出实际打印命令
-				}else {
-					//没有发出实际打印命令！重试打印
-					var newTime = time || 1;
-					if(newTime < 4){
-						newTime ++ ;
-						defaultPrintPackage(obj,newTime)
-					}else {
-						showResult('标签打印命令发送不成功，请检查网络以及打印机是否连接正常，然后在历史装配记录中重新打印！');
-					}
-				}
-			};
-		};
+		obj.time = time;
+		obj.printMode = 2;
+		resetPrint(obj);
 //		LODOP.PRINT_DESIGN ();// 打印设计
 //		LODOP.PREVIEW();//打印预览
 	} else {
@@ -4473,21 +4452,11 @@
 		}else{
 			LODOP.PRINT();
 		}
-		if (LODOP.CVERSION) {
-			CLODOP.On_Return=function(TaskID,Value){
-				if(Value){
-					//已发出实际打印命令
-				}else {
-					var newTime = time || 1;
-					if(newTime < 4){
-						newTime ++ ;
-						invokeTemplatePrintFunction(pageType,obj,labelTemplate,newTime);
-					}else {
-						showResult('标签打印命令发送不成功，请检查网络以及打印机是否连接正常，然后在历史装配记录中重新打印！');
-					}
-				}
-			};
-		};
+		obj.pageType2 = pageType;
+		obj.labelTemplate2 = labelTemplate;
+		obj.time = time;
+		obj.printMode = 3;
+		resetPrint(obj);
 		return true;
 	}
 	return false;
@@ -4858,4 +4827,30 @@
 		tableHtml += "</table>";
 		LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3], tableHtml);
 	}
+}
+
+//重新打印
+function resetPrint(obj){
+	if (LODOP.CVERSION) {
+		CLODOP.On_Return=function(TaskID,Value){
+			if(Value){
+				//已发出实际打印命令
+			}else {
+				//没有发出实际打印命令！重试打印
+				var newTime = obj.time || 1;
+				if(newTime < 4){
+					newTime ++ ;
+					if(obj.printMode == 1){
+						defaultPrint(obj.barcode,obj.name,obj.unitName,newTime);
+					}else if(obj.printMode == 2){
+						defaultPrintPackage(obj,newTime)
+					}else if(obj.printMode == 3){
+						invokeTemplatePrintFunction(obj.pageType2,obj,obj.labelTemplate2,newTime);
+					}
+				}else {
+					showResult('标签打印命令发送不成功，请检查网络以及打印机是否连接正常，然后在历史装配记录中重新打印！');
+				}
+			}
+		};
+	};
 }
\ No newline at end of file