称重界面操作日志增加记录具体重量

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -120,19 +120,19 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>箱号不存在\n", Color.Red);
                     return;
                 }
-                int ActualWeight = int.Parse(weight.Text == "" ? "0" : weight.Text);
+                double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Trim());
                 if (ActualWeight > 0)
                 {
                     //更新大箱重量
                     sql.Clear();
                     sql.Append("update package set pa_weight='" + ActualWeight + "' where pa_outboxcode= '" + pa_outboxcode.Text + "'");
                     dh.ExecuteSql(sql.GetString(), "update");
-                    OperateResult.AppendText("<<<箱号:" + pa_outboxcode.Text + ",重量:" + ActualWeight + "克\n", Color.Green);
+                    OperateResult.AppendText("<<<箱号:" + pa_outboxcode.Text + ",重量:" + weight.Text + "\n", Color.Green);
                     LogicHandler.InsertMakeProcess(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode, "大箱称量", "大箱称量合格", User.UserCode);
                     OperateResult.AppendText("<<<更新成功\n", Color.Green);
                     //刷新grid的历史称重信息；
                     recordResult(pa_outboxcode.Text, weight.Text, System.DateTime.Now.ToString());
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱称重", "称重成功", "", "");
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱称重:"+weight.Text, "称重成功", "", "");
                     if (autoprint.Checked == true)
                     {
                         try

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -142,16 +142,19 @@ namespace UAS_MES.Make
                         if (ActualWeight >= MinWeight && ActualWeight <= MaxWeight)
                         {
 
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量合格", outboxcode.Text, "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量合格:" + weight.Text, outboxcode.Text, "");
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测合格\n", Color.Green);
                         }
                         else
                         {
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量不合格", outboxcode.Text, "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量不合格:" + weight.Text, outboxcode.Text, "");
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测未通过\n", Color.Red);
                             return;
                         }
                     }
+                    else {
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱称重", "称量完成:" + weight.Text, outboxcode.Text, "");
+                    }
                     if (AutoPrint.Checked)
                     {
                         if (PrintLabel.Items.Count > 0)

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -120,15 +120,18 @@ namespace UAS_MES.Make
                                 if ((ActualWeight >= MinWeight) && (ActualWeight <= MaxWeight))
                                 {
                                     OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测检测合格\n", Color.Green);
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重", "称量合格", sncode.Text, "");
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量合格", sncode.Text, "");
                                 }
                                 else
                                 {
                                     OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测未通过\n", Color.Red);
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重", "称量不合格", sncode.Text, "");
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
                                     return;
                                 }
                             }
+                            else {
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量完成", sncode.Text, "");
+                            }
                             ListViewItem lsi = new ListViewItem();
                             lsi.SubItems.Add(sncode.Text);
                             lsi.SubItems.Add(ActualWeight.ToString());