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

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -170,7 +170,7 @@ namespace UAS_MES.Make
                     lsi.SubItems.Add(System.DateTime.Now.ToString());
                     WeighRecord.Items.Add(lsi);
                     OperateResult.AppendText(">>箱号" + outboxcode.Text + "称重完成\n", Color.Green);
-                    dh.ExecuteSql("update package set pa_weight='" + weight.Text + "', pa_printcount= nvl(pa_printcount,0)+1 where pa_outboxcode='" + outboxcode.Text + "'", "update");
+                    dh.ExecuteSql("update package set pa_weight='" + ActualWeight + "', pa_printcount= nvl(pa_printcount,0)+1 where pa_outboxcode='" + outboxcode.Text + "'", "update");
                     outboxcode.Clear();
                 }
                 else OperateResult.AppendText(">>箱号" + outboxcode.Text + "不存在\n", Color.Red, outboxcode);