添加自动获取箱号，如勾选自动生成不再跳到箱号

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -141,8 +141,11 @@ namespace UAS_MES.Make
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }
-                    pa_outboxcode.SelectAll();
-                    pa_outboxcode.Focus();
+                    if (!AutoGenBoxCode.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
                 }
                 else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱，请封箱后执行打印\n", Color.Red);
             }
@@ -236,7 +239,7 @@ namespace UAS_MES.Make
                             {
                                 //如果勾选了自动生成箱号，在封箱或者首次
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == "" || pa_status.Text == "0"))
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
                             }
                         }
                         if (pa_outboxcode.Text == "")
@@ -293,7 +296,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
                                 }
                                 if (!CheckOutBoxLength())
                                 {
@@ -333,8 +336,11 @@ namespace UAS_MES.Make
                                             Print_Click(new object(), new EventArgs());
                                         if (!CollecRemark.Checked)
                                         {
-                                            pa_outboxcode.SelectAll();
-                                            pa_outboxcode.Focus();
+                                            if (!AutoGenBoxCode.Checked)
+                                            {
+                                                pa_outboxcode.SelectAll();
+                                                pa_outboxcode.Focus();
+                                            }
                                         }
                                         else
                                         {
@@ -422,8 +428,11 @@ namespace UAS_MES.Make
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "装箱采集", "封箱成功", pa_outboxcode.Text, "");
                     if (!CollecRemark.Checked)
                     {
-                        pa_outboxcode.SelectAll();
-                        pa_outboxcode.Focus();
+                        if (!AutoGenBoxCode.Checked)
+                        {
+                            pa_outboxcode.SelectAll();
+                            pa_outboxcode.Focus();
+                        }
                     }
                     else
                     {
@@ -663,7 +672,7 @@ namespace UAS_MES.Make
                                     {
                                         SQLS1.Add("update makeserial set ms_checkno='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code + "'");
                                         SQLS1.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-(select count(1) from oqcbatchdetail where obd_outboxcode='" + pa_outboxcode.Text + "') where ob_checkno='" + pa_checkno + "'");
-                                        SQLS1.Add("delete from oqcbatchdetail where obd_outboxcode='"+pa_outboxcode.Text+"'");
+                                        SQLS1.Add("delete from oqcbatchdetail where obd_outboxcode='" + pa_outboxcode.Text + "'");
                                     }
                                     dh.ExecuteSQLTran(SQLS1.ToArray());
                                 }
@@ -700,7 +709,15 @@ namespace UAS_MES.Make
                         int.Parse(OutBoxLength.Text);
                     }
                     BaseUtil.SetCacheData("OutBoxLength", OutBoxLength.Text);
-                    pa_outboxcode.Focus();
+                    if (!AutoGenBoxCode.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
+                    else
+                    {
+                        sn_code.Focus();
+                    }
                 }
                 catch (Exception)
                 {
@@ -764,8 +781,15 @@ namespace UAS_MES.Make
                     dh.UpdateByCondition("package", "pa_remark='" + pa_remark.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "关联信息" + pa_remark.Text + "采集成功\n", Color.Green);
                     pa_remark.Text = "";
-                    pa_outboxcode.SelectAll();
-                    pa_outboxcode.Focus();
+                    if (!AutoGenBoxCode.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
+                    else
+                    {
+                        sn_code.Focus();
+                    }
                 }
                 else OperateResult.AppendText(">>请先采集箱内数据\n", Color.Red);
             }
@@ -776,7 +800,11 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 BaseUtil.SetCacheData("PreFix", PreFix.Text);
-                pa_outboxcode.Focus();
+                if (!AutoGenBoxCode.Checked)
+                {
+                    pa_outboxcode.SelectAll();
+                    pa_outboxcode.Focus();
+                }
             }
         }
     }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -223,8 +223,11 @@ namespace UAS_MES.Make
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }
-                    pa_outboxcode.Focus();
-                    pa_outboxcode.SelectAll();
+                    if (!AutoGenBoxCode.Checked)
+                    {
+                        pa_outboxcode.Focus();
+                        pa_outboxcode.SelectAll();
+                    }
                 }
                 else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱，请封箱后执行打印\n", Color.Red);
             }
@@ -313,7 +316,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
                             }
                         }
                         if (pa_outboxcode.Text == "")
@@ -369,7 +372,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
                                 }
                                 if (!CheckOutBoxLength())
                                 {
@@ -446,8 +449,11 @@ namespace UAS_MES.Make
                                             Print_Click(new object(), new EventArgs());
                                         if (!CollecRemark.Checked)
                                         {
-                                            pa_outboxcode.SelectAll();
-                                            pa_outboxcode.Focus();
+                                            if (!AutoGenBoxCode.Checked)
+                                            {
+                                                pa_outboxcode.Focus();
+                                                pa_outboxcode.SelectAll();
+                                            }
                                         }
                                         else
                                         {
@@ -557,8 +563,11 @@ namespace UAS_MES.Make
                     LoadCheckQTY();
                     if (!CollecRemark.Checked)
                     {
-                        pa_outboxcode.SelectAll();
-                        pa_outboxcode.Focus();
+                        if (!AutoGenBoxCode.Checked)
+                        {
+                            pa_outboxcode.Focus();
+                            pa_outboxcode.SelectAll();
+                        }
                     }
                     else
                     {
@@ -772,7 +781,15 @@ namespace UAS_MES.Make
                         int.Parse(OutBoxLength.Text);
                     }
                     BaseUtil.SetCacheData("OutBoxLength", OutBoxLength.Text);
-                    pa_outboxcode.Focus();
+                    if (!AutoGenBoxCode.Checked)
+                    {
+                        pa_outboxcode.Focus();
+                        pa_outboxcode.SelectAll();
+                    }
+                    else
+                    {
+                        sn_code.Focus();
+                    }
                 }
                 catch (Exception)
                 {
@@ -892,7 +909,15 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 BaseUtil.SetCacheData("PreFix", PreFix.Text);
-                pa_outboxcode.Focus();
+                if (!AutoGenBoxCode.Checked)
+                {
+                    pa_outboxcode.Focus();
+                    pa_outboxcode.SelectAll();
+                }
+                else
+                {
+                    sn_code.Focus();
+                }
             }
         }
     }