shim 8 years ago
parent
commit
8f5caec0f9

+ 1 - 0
UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -252,6 +252,7 @@ namespace UAS_MES.Make
             {
                 doc.Close();
             }
+            BaseUtil.ClosePrint(lbl);
         }
 
         private void pr_code_Leave(object sender, EventArgs e)

+ 4 - 1
UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -26,6 +26,8 @@ namespace UAS_MES.Make
 
         ApplicationClass lbl;
 
+        Document doc;
+
         Thread InitPrint;
 
         Thread thread;
@@ -155,7 +157,8 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护栈板标签模板\n", Color.Red, palletcode);
                                     return;
                                 }
-                                Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.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, palletcode.Text, int.Parse(printNum.Text), indate[PrintLabel.SelectedIndex]);
                             }
                             catch (Exception ex)
                             {