增加工位号兼容功能 不依赖固定的 OP10 OP20做硬编码判定 通过App.config作为工位依据
This commit is contained in:
@@ -134,18 +134,24 @@ namespace MesWork
|
||||
// ====================================================================
|
||||
// 称重交互核心方法
|
||||
// ====================================================================
|
||||
/// <summary>
|
||||
/// 获取称重类型:地面/放油前/放油后
|
||||
/// Ground模式:统一返回"地面"
|
||||
/// Hanging模式:OP10=放油前,OP20=放油后
|
||||
/// </summary>
|
||||
private string GetWeighingType(string opName)
|
||||
{
|
||||
if (WeighingType == "Ground")
|
||||
return "地面";
|
||||
// Hanging模式
|
||||
return opName == "OP10" ? "放油前" : "放油后";
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取称重类型:地面/放油前/放油后
|
||||
/// Ground模式:统一返回"地面"
|
||||
/// Hanging模式:工位1=放油前,工位2=放油后
|
||||
/// </summary>
|
||||
private string GetWeighingType(string opName)
|
||||
{
|
||||
if (WeighingType == "Ground")
|
||||
return "地面";
|
||||
|
||||
if (string.Equals(opName, Station1OpName, StringComparison.OrdinalIgnoreCase))
|
||||
return "放油前";
|
||||
|
||||
if (string.Equals(opName, Station2OpName, StringComparison.OrdinalIgnoreCase))
|
||||
return "放油后";
|
||||
|
||||
throw new InvalidOperationException($"工位号[{opName}]未匹配到App.config中的Station1OpName/Station2OpName,请检查工位配置");
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -422,7 +428,7 @@ namespace MesWork
|
||||
}
|
||||
else
|
||||
{
|
||||
// 找不到放油前记录(可能直接进OP20):创建一条放油后记录并标记完成
|
||||
// 找不到放油前记录(可能直接进放油后工位):创建一条放油后记录并标记完成
|
||||
curveWeighingRecordId = B_DB_Opera.InsertWeighingRecord(opName, "空中放油后", engineNo, "", "", "",
|
||||
0, weight, 0, 0, 0, 0, 0, 0, 0, 2, waterContent,
|
||||
opName, Curr_UserName, isComplete: 1); // 异常兜底记录,质量直接判不合格
|
||||
@@ -458,7 +464,7 @@ namespace MesWork
|
||||
/// 扫码枪扫码完成后的业务处理
|
||||
/// 将码值写入PLC地址102500,触发完成信号100016=1,1秒后复位
|
||||
/// </summary>
|
||||
/// <param name="opName">工位号(OP10/OP20),由COM口绑定决定</param>
|
||||
/// <param name="opName">工位号,由COM口绑定决定</param>
|
||||
/// <param name="barcode">扫到的条码值</param>
|
||||
public void Barcode_HandleScan(string opName, string barcode)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user