打印修改

UAS_MES_ZDXW/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -35,7 +35,7 @@ namespace UAS_MES_NEW.Make
         Thread InitPrint;
         ApplicationClass lbl;
 
-        Engine engine;
+        public BarTender.Application engine;
 
         DataTable Dbfind;
 
@@ -91,7 +91,7 @@ namespace UAS_MES_NEW.Make
         {
             try
             {
-                engine = new Engine(true);
+                engine = new BarTender.Application();
             }
             catch (Exception)
             {
@@ -231,10 +231,10 @@ namespace UAS_MES_NEW.Make
 
                                     for (int i = 0; i < _dt.Rows.Count; i++)
                                     {
-                                        if (Print.BarTender1(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                        if (Print.Bartender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                                         {
                                             //提示用户打印成功
-                                            OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                            OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
                                         }
                                         else
                                         {

UAS_MES_ZDXW/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -247,7 +247,7 @@ namespace UAS_MES_NEW.Make
             DataTable dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             if (dt.Rows.Count == 0)
             {
-                return;
+                dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode is null and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             }
             PrintLabel.DataSource = dt;
             PrintLabel.DisplayMember = "la_url";