彩盒标打印工序更新修改

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -165,8 +165,6 @@ namespace UAS_MES.Make
                     // 获取工单归属工单下一工序是否正确
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                     {
-                        if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage2))
-                        {
                             //获取工单的其他信息
                             sql.Clear();
                             sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
@@ -227,6 +225,8 @@ namespace UAS_MES.Make
                                     Print.CodeSoft(lbl, 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.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage2);
                                     //刷新打印数量和剩余数量
                                     dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
                                     BaseUtil.SetFormValue(Controls, dt);
@@ -238,7 +238,6 @@ namespace UAS_MES.Make
                                 else
                                 {
                                     OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护机身标签\n", Color.Red);
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                     return;
                                 }
                                 if (CheckTSN.Checked == true)
@@ -248,18 +247,7 @@ namespace UAS_MES.Make
                                 }else
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             }
-                        }
-                        else
-                        {
-                            sncode.Text = "";
-                            OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
-                            if (CheckTSN.Checked == true) {
-                                OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                                ms_id = null;
-                            }
-                            else
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        }
+                      
                     }
                     else {
                         sncode.Text = "";