增加线性工件校准 增加信号变化日志记录

This commit is contained in:
XingCheng3
2026-05-13 00:30:32 +08:00
parent 1e908cf72f
commit 14ff9fa4c3
10 changed files with 2182 additions and 2040 deletions

View File

@@ -52,16 +52,14 @@ namespace MesWork
}
public static void Event_Signal_Log(string opName, int tagTypeCodeID, string value, string tagID)
public static void Event_Signal_Log(string opName, int tagTypeCodeID, string signalName, string value)
{
var ChangeTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
var procedureName = "Event_Signal_Log";
var sqlParameter = new SqlParameter[] {
new SqlParameter("@OpName", opName),
new SqlParameter("@TagTypeCodeID", tagTypeCodeID),
new SqlParameter("@Value", value),
new SqlParameter("@ChangeTime",ChangeTime),
new SqlParameter("@TagID", tagID)
new SqlParameter("@SignalName", signalName),
new SqlParameter("@TagValue", value)
};
SqlOperation.ExecuteStoredProcedure(procedureName, sqlParameter, out string errorMessage);
@@ -261,49 +259,37 @@ namespace MesWork
}
/// <summary>
/// 查询指定工位的工具标定配置。
/// 查询指定工位和原始重量匹配的工具标定配置。
/// </summary>
public static bool QueryToolCalibration(string opName, out string toolName, out string calibrationValue, out string formula, out string description, out string msg)
public static bool QueryToolCalibration(string opName, decimal rawWeight, out string toolName, out string formula, out string description, out string msg)
{
toolName = "";
calibrationValue = "";
formula = "";
description = "";
msg = "";
try
var sqlParameter = new SqlParameter[] {
new SqlParameter("@工位号", opName ?? ""),
new SqlParameter("@重量", rawWeight)
};
SqlOperation.ExecuteStoredProcedure("工具管理_查询匹配标定", sqlParameter, out DataTable dt, out string err);
if (dt == null)
{
using (var conn = new SqlConnection(MesWorkForm.ConnectionString))
using (var cmd = conn.CreateCommand())
{
cmd.CommandText = @"
SELECT TOP 1 [工具名称], [重量标定], [计算公式], [说明]
FROM [工具管理]
WHERE [工位号] = @工位号
ORDER BY [ID]";
cmd.Parameters.Add(new SqlParameter("@工位号", opName ?? ""));
conn.Open();
using (var reader = cmd.ExecuteReader())
{
if (!reader.Read())
{
msg = $"未找到[{opName}]工具标定配置";
return false;
}
toolName = reader["工具名称"]?.ToString() ?? "";
calibrationValue = reader["重量标定"]?.ToString() ?? "";
formula = reader["计算公式"]?.ToString() ?? "";
description = reader["说明"]?.ToString() ?? "";
return true;
}
}
}
catch (Exception err)
{
msg = $"查询[{opName}]工具标定配置失败:{err.Message}";
msg = string.IsNullOrWhiteSpace(err) ? $"查询[{opName}]工具标定配置失败" : err;
return false;
}
if (dt.Rows.Count == 0)
{
msg = "";
return false;
}
var row = dt.Rows[0];
toolName = row["工具名称"]?.ToString() ?? "";
formula = row["计算公式"]?.ToString() ?? "";
description = row["说明"]?.ToString() ?? "";
return true;
}
/// <summary>