勾选自动生成采集满不跳回箱号

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -299,12 +299,12 @@ namespace UAS_MES.Make
                                         pa_makecode.Text = carton_macode;
                                         dh.ExecuteSql("update package set pa_makecode='" + carton_macode + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                     }
-                                  
+
                                     //如果是线内并且下一工序等于当前岗位资源工序
                                     if (pa_nextstep != "" && pa_nextstep == User.CurrentStepCode)
                                     {
                                         LogicHandler.OutBoxStepPass(outboxcode.Text, pa_makecode.Text, User.UserSourceCode, User.UserCode, "栈板采集成功，栈板号:" + pa_outboxcode.Text, "栈板采集");
-                                    }                
+                                    }
                                     //更新箱号的NextStepCode
                                     if (pa_totalqty.Text == "1")
                                     {
@@ -320,8 +320,11 @@ namespace UAS_MES.Make
                                     {
                                         dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                         OperateResult.AppendText("大箱" + pa_outboxcode.Text + "已装满,封箱成功");
-                                        pa_outboxcode.Focus();
-                                        pa_outboxcode.SelectAll();
+                                        if (!AutoOutBoxCode.Checked)
+                                        {
+                                            pa_outboxcode.Focus();
+                                            pa_outboxcode.SelectAll();
+                                        }
                                         if (AutoPrint.Checked)
                                         {
                                             OperateResult.AppendText(">>箱已装满，自动打印!\n", Color.Green);
@@ -429,8 +432,7 @@ namespace UAS_MES.Make
             {
                 if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
-                   // doc = lbl.Documents.Open(ftpOperater.DownLoadTo + 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))
+                    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))
                     {
                         OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
                     }
@@ -438,8 +440,11 @@ namespace UAS_MES.Make
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }
-                    pa_outboxcode.Focus();
-                    pa_outboxcode.SelectAll();
+                    if (!AutoOutBoxCode.Checked)
+                    {
+                        pa_outboxcode.Focus();
+                        pa_outboxcode.SelectAll();
+                    }
                 }
                 else OperateResult.AppendText(">>必须封箱才能进行打印\n", Color.Red);
             }