出现异常正常更新SN

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrintZX.cs

@@ -239,64 +239,75 @@ namespace UAS_MES_NEW.Make
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 return;
                             }
-                            //更新至下一步工序
-                            if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
+                            try
                             {
-                                //提示正确返回时传递的信息
-                                if (ErrorMessage.Contains("AFTERSUCCESS"))
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                                if (Print.BarTender(Tag.ToString(), engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                //更新至下一步工序
+                                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
                                 {
-                                    //提示用户打印成功
-                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                                }
-                                if (PrintSecond.Checked)
-                                {
-                                    if (Print.BarTender(Tag.ToString(), engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                    //提示正确返回时传递的信息
+                                    if (ErrorMessage.Contains("AFTERSUCCESS"))
+                                        OperateResult.AppendText(">>" + ErrorMessage + "\n");
+                                    if (Print.BarTender(Tag.ToString(), 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);
                                     }
                                     else
                                     {
                                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                     }
-                                }
-                                if (PrintThird.Checked)
-                                {
-                                    if (Print.BarTender(Tag.ToString(), engine, PrintLabel2.Text, PrintLabel2.SelectedValue.ToString(), PrintList2.Text, sncode.Text, int.Parse(PrintNum2.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                    if (PrintSecond.Checked)
                                     {
-                                        OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                        if (Print.BarTender(Tag.ToString(), engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                        {
+                                            OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                                        }
                                     }
-                                    else
+                                    if (PrintThird.Checked)
                                     {
-                                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                                        if (Print.BarTender(Tag.ToString(), engine, PrintLabel2.Text, PrintLabel2.SelectedValue.ToString(), PrintList2.Text, sncode.Text, int.Parse(PrintNum2.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
+                                        {
+                                            OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                                        }
                                     }
+                                    if (CollectRemark.Checked && Remark.Text != "")
+                                    {
+                                        LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
+                                    }
+                                    if (dev_no != "")
+                                    {
+                                        dh.ExecuteSql("update makeserial set ms_sncode='" + dev_no + "' where ms_id='" + oMsID + "'", "update");
+                                    }
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
+                                    //刷新打印数量和剩余数量
+                                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty 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);
+                                    sncode.Text = "";
+                                    ms_id = null;
+                                    sncode.Focus();
                                 }
-                                if (CollectRemark.Checked && Remark.Text != "")
+                                else
                                 {
-                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
+                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
+                                    ms_id = null;
+                                    sncode.Focus();
                                 }
+                            }
+                            catch (Exception ex)
+                            {
                                 if (dev_no != "")
                                 {
                                     dh.ExecuteSql("update makeserial set ms_sncode='" + dev_no + "' where ms_id='" + oMsID + "'", "update");
                                 }
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
-                                //刷新打印数量和剩余数量
-                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty 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);
-                                sncode.Text = "";
-                                ms_id = null;
-                                sncode.Focus();
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
-                                ms_id = null;
-                                sncode.Focus();
+                                BaseUtil.ShowError(ex.Message);
                             }
                         }
                         else