修改打印下一个机身标签

UAS_MES_YDCY/FunctionCode/Make/Make_FuselageLabelPrintNext.cs

@@ -158,7 +158,7 @@ namespace UAS_MES_NEW.Make
                                 //提示用户“<< 序列号：XXXX”
                                 if (PrintLabel.SelectedValue == null)
                                 {
-                                    OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
+                                    OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护流程卡签\n", Color.Red, sncode);
                                     return;
                                 }
                                 if (pr_change)
@@ -198,7 +198,7 @@ namespace UAS_MES_NEW.Make
                             if (dt1.Rows.Count > 0)
                             {
                                 string sn = dt1.Rows[0]["msl_sncode"].ToString();
-                                if (PublicMethod.Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                                if (PublicMethod.Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "流程卡", "0", out oErrorMessage))
                                 {
                                     //提示用户打印成功
                                     OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
@@ -212,7 +212,7 @@ namespace UAS_MES_NEW.Make
                             {
                                 OperateResult.AppendText(">>工单号:" + ma_code.Text + "不存在未打印的SN或者未导入SN清单\n", Color.Red, sncode);
                             }
-                            //if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                            //if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "流程卡", "0", out oErrorMessage))
                             //{
                             //    //提示用户打印成功
                             //    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
@@ -222,9 +222,9 @@ namespace UAS_MES_NEW.Make
                             //    OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
                             //}
                             //记录日志
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "流程卡打印", "流程卡打印成功", sncode.Text, "");
                             //更新打印的数据
-                            if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
+                            if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "流程卡打印", "流程卡打印成功", User.UserCode, out oErrorMessage))
                             {
                                 //提示正确返回时传递的信息
                                 if (oErrorMessage.Contains("AFTERSUCCESS"))
@@ -262,7 +262,7 @@ namespace UAS_MES_NEW.Make
                         //标签为空
                         else
                         {
-                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护流程卡签\n", Color.Red, sncode);
                         }
                     }
                     else
@@ -278,10 +278,10 @@ namespace UAS_MES_NEW.Make
         }
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            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");
+            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)
             {
-                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");
+                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";
@@ -320,7 +320,7 @@ namespace UAS_MES_NEW.Make
             if (dt.Rows.Count > 0)
             {
                 string sn = dt.Rows[0]["msl_sncode"].ToString();
-                if (PublicMethod.Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                if (PublicMethod.Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "流程卡", "0", out oErrorMessage))
                 {
                     //提示用户打印成功
                     OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);