浏览代码

文件打印方式修改

Hcsy 8 年之前
父节点
当前提交
d7fedc1284

+ 3 - 2
UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -23,7 +23,7 @@ namespace UAS_MES.Make
         AutoSizeFormClass asc = new AutoSizeFormClass();
         System.DateTime[] indate;
         DataHelper dh;
-
+        Document doc;
         //true的时候表示从串口读取数据
         bool GetData = true;
 
@@ -146,7 +146,8 @@ namespace UAS_MES.Make
                     {
                         try
                         {
-                            Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                            doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
+                            Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                             dh.ExecuteSql("update package set pa_printcount= pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                             printcount++;
                             weightsum.Text = printcount + "";

+ 3 - 1
UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -16,6 +16,7 @@ namespace UAS_MES.Make
     {
         DataHelper dh;
         DataTable dt;
+        Document doc;
         LogStringBuilder sql = new LogStringBuilder();
         AutoSizeFormClass asc = new AutoSizeFormClass();
         System.DateTime[] indate;
@@ -237,7 +238,8 @@ namespace UAS_MES.Make
                                 //更新至下一步工序
                                 if (LogicHandler.SetStepResult((oMakeCode == "null" ? ma_code.Text : oMakeCode), User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage2))
                                 {
-                                    Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                                    doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
+                                    Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                                     //提示用户打印成功
                                     OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");

+ 1 - 1
UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.cs

@@ -444,7 +444,7 @@ namespace UAS_MES.SystemSetting
         private void 产品标签维护_FormClosing(object sender, FormClosingEventArgs e)
         {
             //关闭所有的打印文件
-            lbl.Quit();
+            BaseUtil.ClosePrint(lbl);
         }
 
         private void Save_Click(object sender, EventArgs e)