Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -63,7 +63,14 @@ namespace UAS_MES.Make
 
         private void deleteButton1_Click(object sender, EventArgs e)
         {
-
+            macode = "";
+            ms_bt = "";
+            isBT = false;
+            isMAC = false;
+            BaseUtil.CleanForm(this);
+            mcd_okqty.Text = printcount + "";
+            OperateResult.AppendText(">>清空数据，输入SN\n", Color.Green);
+            sncode.Focus();
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)
@@ -125,6 +132,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
+                            sncode.Text = "";
                             OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                         }
 
@@ -144,6 +152,7 @@ namespace UAS_MES.Make
                         ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
                         if (sncode.Text == ms_bt)
                         {
+                            sncode.Text = "";
                             OperateResult.AppendText(">>BT错误,重复\n", Color.Red);
                             OperateResult.AppendText(">>请输入BT\n", Color.Green);
                             return;
@@ -151,14 +160,12 @@ namespace UAS_MES.Make
                         else
                         {
                             ms_bt = sncode.Text;
-                            ErrorMessage = "工单" + sncode.Text + "BT采集完成>>>请输入SN";
+                            ErrorMessage = "BT采集完成，请输入MAC";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                            sncode.Text = "";
                             isBT = false;
                             isMAC = true;
-                            ErrorMessage = ">>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         }
-
                     }
                 }
                 else
@@ -176,6 +183,7 @@ namespace UAS_MES.Make
                     ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
                     if (sncode.Text == ms_mac)
                     {
+                        sncode.Text = "";
                         OperateResult.AppendText(">>MAC错误,重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入MAC\n", Color.Green);
                         return;
@@ -185,7 +193,7 @@ namespace UAS_MES.Make
                         if (LogicHandler.UpdateMakeMessage(sn_code, ms_makecode.Text, "BT/MAC采集", User.UserSourceCode, User.UserCode, "采集完成", out ErrorMessage))
                         {
                             dh.UpdateByCondition("makeserial", "ms_mac = '" + sncode.Text + "' ," + "ms_bt = '" + ms_bt + "'", "ms_id = '" + oMsID + "'");
-                            ErrorMessage = "BT/MAC采集完成,执行更新";
+                            ErrorMessage = "MAC采集完成,执行更新";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                             BaseUtil.CleanForm(this);
                             printcount++;

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -98,6 +98,7 @@ namespace UAS_MES.Make
                         }
                     }
                     else {
+                        sncode.Text = "";
                         OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                     }
                 }
@@ -120,6 +121,7 @@ namespace UAS_MES.Make
                         return;
                     }
                     else if (sncode.Text == net_code) {
+                        sncode.Text = "";
                         OperateResult.AppendText(">>网标错误,重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入网标\n", Color.Green);
                         return;
@@ -160,11 +162,20 @@ namespace UAS_MES.Make
 
         private void deleteButton1_Click(object sender, EventArgs e)
         {
-            if (isnetcode) {
+            if (isnetcode)
+            { 
                 BaseUtil.CleanForm(this);
-                mcd_remainqty.Text = 0+ "";
+                mcd_remainqty.Text = 0 + "";
                 OperateResult.AppendText(">>清除完成，清重新输入SN号\n", Color.Green);
+                mcd_okqty.Text = printcount + "";
                 isnetcode = false;
+                sncode.Focus();
+            }
+            else {
+                BaseUtil.CleanForm(this);
+                mcd_okqty.Text = printcount + "";
+                OperateResult.AppendText(">>输入SN\n", Color.Green);
+                sncode.Focus();
             }
         }
     }

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -34,11 +34,15 @@ namespace UAS_MES.Make
         string sn_code;
         //当前提示的索引
         int RemainIndex = 0;
+        //消息提示
+        string ErrorMessage;
         ApplicationClass lbl;
+
         public Make_ColorBoxLabelPrint()
         {
             InitializeComponent();
         }
+
         private void Make_ColorBoxLabelPrint_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
@@ -46,6 +50,7 @@ namespace UAS_MES.Make
             sncode.Focus();
             asc.controllInitializeSize(this);
         }
+
         private void sn_code_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -56,15 +61,12 @@ namespace UAS_MES.Make
                     return;
                 }
                 string oMsID;
-                string ErrorMessage2;
+
                 string oMakeCode;
                 // 获取工单归属工单下一工序是否正确
-                if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
-                {
-                    if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
-                    {
+                if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
+                {    
                         //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                      //  macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "'").ToString();
                         if (ma_code.Text != macode || macode == "")
                         {
                             //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
@@ -81,6 +83,10 @@ namespace UAS_MES.Make
                         if (dt.Rows.Count > 0)
                         {
                             BaseUtil.SetFormValue(this.Controls, dt);
+                            //提示用户“<<工单号：取ma_makecode”
+                            OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
+                            //提示用户“<< 序列号：XXXX”
+                            OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
                             sn_code = sncode.Text;
                         }
                         else
@@ -88,7 +94,6 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
 
                         }
-                        string ErrorMessage = "";
                         string result = "";
                         if (int.Parse(mcd_remainqty.Text) <= 0)
                         {
@@ -105,11 +110,11 @@ namespace UAS_MES.Make
                                 Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ma_code.Text, int.Parse(PrintNum.Text));
                                 if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "彩盒打印", User.UserSourceCode, User.UserCode, "彩盒打印成功", out ErrorMessage))
                                 {
-                                    ErrorMessage = "打印完成,执行更新";
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                                    OperateResult.AppendText(">>打印完成, 执行更新\n", Color.Green);
                                     mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
                                     mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
                                     sncode.Text = "";
+                                    sncode.Focus();
                                 }
                                 else
                                 {
@@ -118,21 +123,14 @@ namespace UAS_MES.Make
                             }
                             else
                             {
-                                ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                                OperateResult.AppendText(">>该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择\n", Color.Red);
                                 return;
                             }
-                            ErrorMessage = ">>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                        }
-                    }
-                    else
-                    {
-                        OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
-                    }
+                            OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                        }         
                 }
                 else {
-                    OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                    OperateResult.AppendText( ErrorMessage + "\n", Color.Red);
                 }
             }
         }
@@ -149,17 +147,21 @@ namespace UAS_MES.Make
                 ftp.Download(dt.Rows[i]["pl_labelname"].ToString());
             }
         }
+
         private void Make_ColorBoxLabelPrint_Activated(object sender, EventArgs e)
         {
             sncode.Focus();
         }
+
         private void Make_ColorBoxLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
         {
             lbl.Quit();
         }
+
         private void Make_ColorBoxLabelPrint_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }
+
     }
 }