Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -528,10 +528,10 @@ namespace UAS_MES.Make
                 string Seal = MessageBox.Show(this.ParentForm, "是否确认封箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                 if (Seal == "Yes")
                 {
+                    ActWeigh = weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Trim();
+                    float weigh = float.Parse(ActWeigh);
                     if (PR_CHECKCARTONW != "0" && pa_standardqty.Text == pa_currentqty.Text)
                     {
-                        ActWeigh = weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Trim();
-                        float weigh = float.Parse(ActWeigh);
                         if (!(weigh >= MinWeight && weigh <= MaxWeight) || weigh == 0)
                         {
                             OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "重量不符合标准重量,不能完成工序过站\n", Color.Red);
@@ -540,7 +540,7 @@ namespace UAS_MES.Make
                             return;
                         }
                     }
-                    dh.UpdateByCondition("package", "pa_status=1,pa_totalqty=pa_currentqty,pa_packageqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                    dh.UpdateByCondition("package", "pa_status=1,pa_totalqty=pa_currentqty,pa_packageqty=pa_currentqty,pa_weight=" + weigh + "", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     pa_status.Text = "1";
                     pa_standardqty.Text = "";
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "封箱成功", pa_outboxcode.Text, "");