From 2d5f2602017d87e1c113d9d1496d4ad3f506e446 Mon Sep 17 00:00:00 2001 From: XingCheng3 <1773407212@qq.com> Date: Tue, 12 May 2026 13:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AD=A6=E8=AE=A1=E6=95=B0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SCADA/Core/WeightCalibrationHelper.cs | 5 +++-- SCADA/Pages/UC_ToolMgmt.cs | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/SCADA/Core/WeightCalibrationHelper.cs b/SCADA/Core/WeightCalibrationHelper.cs index 0dd8d8b..4292414 100644 --- a/SCADA/Core/WeightCalibrationHelper.cs +++ b/SCADA/Core/WeightCalibrationHelper.cs @@ -73,8 +73,9 @@ namespace MesWork { var interpreter = new Interpreter(); interpreter.Reference(typeof(Math)); - interpreter.SetVariable("x", xValue); - interpreter.SetVariable("X", xValue); + double x = Convert.ToDouble(xValue); + interpreter.SetVariable("x", x); + interpreter.SetVariable("X", x); object value = interpreter.Eval(formula); if (value == null) diff --git a/SCADA/Pages/UC_ToolMgmt.cs b/SCADA/Pages/UC_ToolMgmt.cs index 6ad971b..a7e5b1c 100644 --- a/SCADA/Pages/UC_ToolMgmt.cs +++ b/SCADA/Pages/UC_ToolMgmt.cs @@ -39,7 +39,6 @@ namespace MesWork.Pages dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "ID", HeaderText = "ID", DataPropertyName = "ID", Visible = false }); dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "工位号", HeaderText = "工位号", DataPropertyName = "工位号", FillWeight = 70 }); dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "工具名称", HeaderText = "工具名称", DataPropertyName = "工具名称", FillWeight = 120 }); - dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "重量标定", HeaderText = "重量标定", DataPropertyName = "重量标定", FillWeight = 90 }); dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "计算公式", HeaderText = "计算公式", DataPropertyName = "计算公式", FillWeight = 150 }); dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "说明", HeaderText = "说明", DataPropertyName = "说明", FillWeight = 180 }); dgv_Data.Columns.Add(new DataGridViewTextBoxColumn { Name = "修改时间", HeaderText = "修改时间", DataPropertyName = "修改时间", FillWeight = 100 }); @@ -99,7 +98,6 @@ namespace MesWork.Pages txtStation.ReadOnly = true; txtStation.BackColor = Color.FromArgb(245, 247, 250); var txtName = CrudHelper.AddTextField(dlg, "工具名称：", ref y, row.Cells["工具名称"]?.Value?.ToString(), inputWidth: 320); - var txtCalVal = CrudHelper.AddTextField(dlg, "重量标定：", ref y, row.Cells["重量标定"]?.Value?.ToString(), inputWidth: 320); var txtFormula = CrudHelper.AddTextField(dlg, "计算公式：", ref y, row.Cells["计算公式"]?.Value?.ToString(), inputWidth: 320); var txtDesc = CrudHelper.AddTextField(dlg, "说明：", ref y, row.Cells["说明"]?.Value?.ToString(), inputWidth: 320); CrudHelper.AddDialogButtons(dlg, ref y); @@ -119,7 +117,6 @@ namespace MesWork.Pages new SqlParameter("@ID", int.Parse(row.Cells["ID"]?.Value?.ToString() ?? "0")), new SqlParameter("@工位号", txtStation.Text.Trim()), new SqlParameter("@工具名称", txtName.Text.Trim()), - new SqlParameter("@重量标定", txtCalVal.Text.Trim()), new SqlParameter("@计算公式", txtFormula.Text.Trim()), new SqlParameter("@说明", txtDesc.Text.Trim()), };