页面修改

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -98,27 +98,28 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red);
                             }
                         }
-
-                        //所选标签不为空
-                        if (PrintLabel.SelectedValue != null)
+                        //更新打印的数据
+                        if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text,  "机身标打印", "机身标打印成功", User.UserCode,  out oErrorMessage))
                         {
-                            //如果打印张数为空，返回
-                            if (PrintNum.Text==""|| int.Parse(PrintNum.Text)==0) {
-                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red);
-                                //清空输入框的值，聚焦
-                                sncode.Text = "";
-                                sncode.Focus();
-                                //提示用户“>>请输入SN”
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
-                                return;
-                            }
-                            //按照打印张数打印
-                            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);
-                            //更新打印的数据
-                            if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserCode, "机身标打印成功", out oErrorMessage))
+                            //所选标签不为空
+                            if (PrintLabel.SelectedValue != null)
                             {
+                                //如果打印张数为空，返回
+                                if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
+                                {
+                                    OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red);
+                                    //清空输入框的值，聚焦
+                                    sncode.Text = "";
+                                    sncode.Focus();
+                                    //提示用户“>>请输入SN”
+                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                    return;
+                                }
+                                //按照打印张数打印
+                                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);
+
                                 //清空输入框的值，聚焦
                                 sncode.Text = "";
                                 sncode.Focus();
@@ -140,18 +141,18 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>请输入SN\n", Color.Green);
                                 }
                             }
+                            //标签为空
                             else
                             {
+                                OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red);
                                 sncode.Text = "";
-                                sncode.Focus();
-                                OperateResult.AppendText(">>更新工序失败" + oErrorMessage + "\n", Color.Red);
                             }
                         }
-                        //标签为空
                         else
                         {
-                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red);
                             sncode.Text = "";
+                            sncode.Focus();
+                            OperateResult.AppendText(">>更新工序失败" + oErrorMessage + "\n", Color.Red);
                         }
                     }
                     else

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -59,6 +59,8 @@ namespace UAS_MES.FunctionCode.Make
         private void close_Click(object sender, EventArgs e)
         {
             //关闭当前页面
+            showResult.Clear();
+            this.Close();
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)