update

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -460,7 +460,7 @@ namespace UAS_MES.Make
                                         if (CollecRemark.Checked && pa_remark.Text == "")
                                         {
                                             dh.UpdateByCondition("package", "pa_status=0", "pa_outboxcode='" + pa_outboxcode.Text + "'");
-                                            OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选", Color.Red, sn_code);
+                                            OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选\n", Color.Red, sn_code);
                                             pa_remark.SelectAll();
                                             pa_remark.Focus();
                                             return;
@@ -578,7 +578,7 @@ namespace UAS_MES.Make
                     }
                     if (CollecRemark.Checked && pa_remark.Text == "")
                     {
-                        OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选", Color.Red, sn_code);
+                        OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选\n", Color.Red, sn_code);
                         pa_remark.SelectAll();
                         pa_remark.Focus();
                         return;
@@ -973,6 +973,11 @@ 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 = "";
+                        LoadGridData();
+                        if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) == int.Parse(pr_outboxinnerqty.Text))
+                        {
+                            Packing_Click(new object(), new EventArgs());
+                        }
                         if (!AutoGenBoxCode.Checked)
                         {
                             pa_outboxcode.SelectAll();

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -473,7 +473,7 @@ namespace UAS_MES.Make
                                         }
                                         if (CollecRemark.Checked && pa_remark.Text == "")
                                         {
-                                            OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选", Color.Red, sn_code);
+                                            OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选\n", Color.Red, sn_code);
                                             pa_remark.SelectAll();
                                             pa_remark.Focus();
                                             return;
@@ -615,7 +615,7 @@ namespace UAS_MES.Make
                     }
                     if (CollecRemark.Checked && pa_remark.Text == "")
                     {
-                        OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选", Color.Red, sn_code);
+                        OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选\n", Color.Red, sn_code);
                         pa_remark.SelectAll();
                         pa_remark.Focus();
                         return;
@@ -628,11 +628,6 @@ namespace UAS_MES.Make
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量完成:" + weight.Text.Trim(), pa_outboxcode.Text, "");
                     LogicHandler.RecordProdWeight(pa_outboxcode.Text, "CARTON", float.Parse(ActWeigh.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
                     string ms_makecode = dh.getFieldDataByCondition("packagedetail", "pd_makecode", "pd_outboxcode = '" + pa_outboxcode.Text + "'").ToString();
-                    if (CollecRemark.Checked && pa_remark.Text == "")
-                    {
-                        OperateResult.AppendText(">已勾选采集备注，备注信息必须填写，如不需采集，请取消勾选", Color.Red, sn_code);
-                        return;
-                    }
                     if (LogicHandler.OutBoxStepPass(pa_outboxcode.Text, ms_makecode, User.UserSourceCode, User.UserCode, "卡通箱:" + pa_outboxcode.Text + "整箱过站", "卡通箱整箱过站", out ErrorMessage))
                     {
                         dh.UpdateByCondition("package", "pa_nextstep='" + dh.getFieldDataByCondition("packagedetail left join makeserial on ms_sncode=pd_barcode and ms_makecode=pd_makecode", "max(ms_nextstepcode)", "pd_outboxcode='" + pa_outboxcode.Text + "'").ToString() + "', PA_CURRENTSTEP = '' ", "pa_outboxcode='" + pa_outboxcode.Text + "'");
@@ -990,6 +985,11 @@ 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 = "";
+                        LoadGridData();
+                        if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) == int.Parse(pr_outboxinnerqty.Text))
+                        {
+                            Packing_Click(new object(), new EventArgs());
+                        }
                         if (!AutoGenBoxCode.Checked)
                         {
                             pa_outboxcode.SelectAll();