Browse Source

装箱界面控件聚焦的修改

Hcsy 7 years ago
parent
commit
6f5275ff14

+ 20 - 0
UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -325,6 +325,11 @@ namespace UAS_MES.Make
                                             pa_outboxcode.Focus();
                                             pa_outboxcode.SelectAll();
                                         }
+                                        else
+                                        {
+                                            outboxcode.Focus();
+                                            outboxcode.SelectAll();
+                                        }
                                         if (AutoPrint.Checked)
                                         {
                                             OperateResult.AppendText(">>箱已装满,自动打印!\n", Color.Green);
@@ -445,6 +450,11 @@ namespace UAS_MES.Make
                         pa_outboxcode.Focus();
                         pa_outboxcode.SelectAll();
                     }
+                    else
+                    {
+                        outboxcode.Focus();
+                        outboxcode.SelectAll();
+                    }
                 }
                 else OperateResult.AppendText(">>必须封箱才能进行打印\n", Color.Red);
             }
@@ -522,6 +532,16 @@ namespace UAS_MES.Make
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "大箱封箱" + pa_outboxcode.Text + "成功", pa_outboxcode.Text, "");
                             dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                             pa_status.Text = "1";
+                            if (!AutoOutBoxCode.Checked)
+                            {
+                                pa_outboxcode.Focus();
+                                pa_outboxcode.SelectAll();
+                            }
+                            else
+                            {
+                                outboxcode.Focus();
+                                outboxcode.SelectAll();
+                            }
                         }
                     }
                     else OperateResult.AppendText(">>大箱号" + pa_outboxcode.Text + "已封大箱\n", Color.Red);

+ 27 - 7
UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -158,6 +158,11 @@ namespace UAS_MES.Make
                         pa_outboxcode.SelectAll();
                         pa_outboxcode.Focus();
                     }
+                    else
+                    {
+                        sn_code.Focus();
+                        sn_code.SelectAll();
+                    }
                 }
                 else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱,请封箱后执行打印\n", Color.Red);
             }
@@ -418,6 +423,11 @@ namespace UAS_MES.Make
                                                 pa_outboxcode.SelectAll();
                                                 pa_outboxcode.Focus();
                                             }
+                                            else
+                                            {
+                                                sn_code.Focus();
+                                                sn_code.SelectAll();
+                                            }
                                         }
                                         else
                                         {
@@ -543,6 +553,11 @@ namespace UAS_MES.Make
                             pa_outboxcode.SelectAll();
                             pa_outboxcode.Focus();
                         }
+                        else
+                        {
+                            sn_code.Focus();
+                            sn_code.SelectAll();
+                        }
                     }
                     else
                     {
@@ -910,15 +925,15 @@ namespace UAS_MES.Make
                     dh.UpdateByCondition("package", "pa_remark='" + pa_remark.Text.ToUpper() + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "关联信息" + pa_remark.Text + "采集成功\n", Color.Green);
                     pa_remark.Text = "";
-                    if (!AutoGenBoxCode.Checked)
-                    {
+                    //if (!AutoGenBoxCode.Checked)
+                    //{
                         pa_outboxcode.SelectAll();
                         pa_outboxcode.Focus();
-                    }
-                    else
-                    {
-                        sn_code.Focus();
-                    }
+                    //}
+                    //else
+                    //{
+                    //    sn_code.Focus();
+                    //}
                 }
                 else OperateResult.AppendText(">>请先采集箱内数据\n", Color.Red);
             }
@@ -934,6 +949,11 @@ namespace UAS_MES.Make
                     pa_outboxcode.SelectAll();
                     pa_outboxcode.Focus();
                 }
+                else
+                {
+                    sn_code.Focus();
+                    sn_code.SelectAll();
+                }
             }
         }
 

+ 15 - 0
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -229,6 +229,11 @@ namespace UAS_MES.Make
                         pa_outboxcode.Focus();
                         pa_outboxcode.SelectAll();
                     }
+                    else
+                    {
+                        sn_code.Focus();
+                        sn_code.SelectAll();
+                    }
                 }
                 else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱,请封箱后执行打印\n", Color.Red);
             }
@@ -470,6 +475,11 @@ namespace UAS_MES.Make
                                                 pa_outboxcode.Focus();
                                                 pa_outboxcode.SelectAll();
                                             }
+                                            else
+                                            {
+                                                sn_code.Focus();
+                                                sn_code.SelectAll();
+                                            }
                                         }
                                         else
                                         {
@@ -600,6 +610,11 @@ namespace UAS_MES.Make
                             pa_outboxcode.Focus();
                             pa_outboxcode.SelectAll();
                         }
+                        else
+                        {
+                            sn_code.Focus();
+                            sn_code.SelectAll();
+                        }
                     }
                     else
                     {

+ 24 - 2
UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -296,8 +296,16 @@ namespace UAS_MES.Make
                                     {
                                         dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                         OperateResult.AppendText("栈板" + pa_outboxcode.Text + "已装满,封栈板成功\n");
-                                        pa_outboxcode.Focus();
-                                        pa_outboxcode.SelectAll();
+                                        if (!AutoOutBoxCode.Checked)
+                                        {
+                                            pa_outboxcode.Focus();
+                                            pa_outboxcode.SelectAll();
+                                        }
+                                        else
+                                        {
+                                            outboxcode.Focus();
+                                            outboxcode.SelectAll();
+                                        }
                                         if (AutoPrint.Checked)
                                         {
                                             OperateResult.AppendText(">>打印栈板" + pa_outboxcode.Text + ",自动打印!\n", Color.Green);
@@ -406,6 +414,10 @@ namespace UAS_MES.Make
                         pa_outboxcode.Focus();
                         pa_outboxcode.SelectAll();
                     }
+                    else {
+                        outboxcode.Focus();
+                        outboxcode.SelectAll();
+                    }
                     //doc = lbl.Documents.Open(PrintLabel.Text);
                     if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                     {
@@ -488,6 +500,16 @@ namespace UAS_MES.Make
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "栈板采集", "封栈板" + pa_outboxcode.Text + "成功", outboxcode.Text, "");
                             dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                             pa_status.Text = "1";
+                            if (!AutoOutBoxCode.Checked)
+                            {
+                                pa_outboxcode.Focus();
+                                pa_outboxcode.SelectAll();
+                            }
+                            else
+                            {
+                                outboxcode.Focus();
+                                outboxcode.SelectAll();
+                            }
                         }
                     }
                     else OperateResult.AppendText(">>栈板号" + pa_outboxcode.Text + "已封栈板\n", Color.Red);