|
|
@@ -573,13 +573,23 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
MessageBox.Show("打印文件不存在");
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
- doc2 = lbl.Formats.Open(@"C:\打印标签\" + LabelName);
|
|
|
+ doc2 = lbl.Formats.Open(@"C:\打印标签\" + LabelName);
|
|
|
if (doc2 == null)
|
|
|
{
|
|
|
MessageBox.Show("标签文件打开失败");
|
|
|
return false;
|
|
|
}
|
|
|
+ try
|
|
|
+ {
|
|
|
+ for (int k = 0; k < doc2.NamedSubStrings.Count; k++)
|
|
|
+ {
|
|
|
+ doc2.NamedSubStrings.Item(k).Value = null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
+ LogManager.DoLog(ex.Message + ex.StackTrace);
|
|
|
+ }
|
|
|
//string ParamValue = format.SubStrings.GetAll("#", "$");
|
|
|
//string[] paramname = ParamValue.Split('$');
|
|
|
//for (int i = 0; i < paramname.Length; i++)
|
|
|
@@ -639,17 +649,6 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
doc2.PrintSetup.Printer = PrinterName;
|
|
|
doc2.PrintOut(false, false);
|
|
|
LogicHandler.DoCommandLog(iCaller, User.UserCode, "", User.UserLineCode, User.UserSourceCode, "打印", "成功打印", SnCode, "");
|
|
|
- try
|
|
|
- {
|
|
|
- //for (int k = 0; k < doc2.SubStrings.Count; k++)
|
|
|
- //{
|
|
|
- // doc2.SubStrings[k].Value = null;
|
|
|
- //}
|
|
|
- }
|
|
|
- catch (Exception ex)
|
|
|
- {
|
|
|
- LogManager.DoLog(ex.Message + ex.StackTrace);
|
|
|
- }
|
|
|
LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode, PrintFile.Name);
|
|
|
return true;
|
|
|
}
|