This commit is contained in:
ldw
2025-09-18 11:11:38 +08:00
parent 83fbe2a14d
commit b7b328eead
15 changed files with 846 additions and 460 deletions
+123
View File
@@ -95,6 +95,7 @@ namespace JinYuan.VirtualDataLibrary
/// MES配置文件类
/// </summary>
public static MesConfig mesConfig = new MesConfig();
public static short[] MESGradingSet = new short[] { 0,0,0,0,0,0};
///创建一个全局的连接状态
public static bool connectState = false;
@@ -301,6 +302,121 @@ namespace JinYuan.VirtualDataLibrary
#endregion
#region 写入分档
public static bool WriteGrading()
{
var res = false;
try
{
if (plcDevice != null && plcDevice.IsConnected)
{
DateTime Date = DateTime.Now;
#region 档位写入
// short[] MESGradingSet = new short[] { 0, 0, 0, 0, 0, 0 };
//1
MESGradingSet[0] = (short)21; // 21 22 23 24 25 26
//2
if (mesConfig.Grading2.Trim().Equals(mesConfig.Grading1.Trim()))
MESGradingSet[1] = MESGradingSet[0];
else
MESGradingSet[1] = (short)(MESGradingSet[0] + 1);
//3
if (mesConfig.Grading3.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim()))
MESGradingSet[2] = MESGradingSet[0];
else
{
if (CommonMethods.mesConfig.Grading3.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim()))
MESGradingSet[2] = MESGradingSet[1];
else
MESGradingSet[2] = (short)(MESGradingSet[1] + 1);
}
//4
if (CommonMethods.mesConfig.Grading4.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim()))
MESGradingSet[3] = MESGradingSet[0];
else
{
if (CommonMethods.mesConfig.Grading4.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim()))
MESGradingSet[3] = MESGradingSet[1];
else
{
if (CommonMethods.mesConfig.Grading4.Trim().Equals(CommonMethods.mesConfig.Grading3.Trim()))
MESGradingSet[3] = MESGradingSet[2];
else
MESGradingSet[3] = (short)(MESGradingSet[2] + 1);
}
}
//5
if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim()))
MESGradingSet[4] = MESGradingSet[0];
else
{
if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim()))
MESGradingSet[4] = MESGradingSet[1];
else
{
if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading3.Trim()))
MESGradingSet[4] = MESGradingSet[2];
else
{
if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading4.Trim()))
MESGradingSet[4] = MESGradingSet[3];
else
MESGradingSet[4] = (short)(MESGradingSet[3] + 1);
}
}
}
//6
if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim()))
MESGradingSet[5] = MESGradingSet[0];
else
{
if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim()))
MESGradingSet[5] = MESGradingSet[1];
else
{
if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading3.Trim()))
MESGradingSet[5] = MESGradingSet[2];
else
{
if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading4.Trim()))
MESGradingSet[5] = MESGradingSet[3];
else
{
if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading5.Trim()))
MESGradingSet[5] = MESGradingSet[4];
else
MESGradingSet[5] = (short)(MESGradingSet[4] + 1);
}
}
}
}
#endregion
var isWrite1 = PlcLink.WriteValue("D2600", MESGradingSet[0], Data_Type.Short);
var isWrite2 = PlcLink.WriteValue("D2601", MESGradingSet[1], Data_Type.Short);
var isWrite3 = PlcLink.WriteValue("D2602", MESGradingSet[2], Data_Type.Short);
var isWrite4 = PlcLink.WriteValue("D2603", MESGradingSet[3], Data_Type.Short);
var isWrite5 = PlcLink.WriteValue("D2604", MESGradingSet[4], Data_Type.Short);
var isWrite6 = PlcLink.WriteValue("D2605", MESGradingSet[5], Data_Type.Short);
if (isWrite1.IsSuccess && isWrite2.IsSuccess && isWrite3.IsSuccess && isWrite4.IsSuccess && isWrite5.IsSuccess && isWrite6.IsSuccess)
{
AddDataMonitorLog(0, $"OK分档档位写入PLC成功![2600~2605]{string.Join(",", MESGradingSet)}");
return true;
}
}
}
catch (Exception ex)
{
AddLog(true, ex.ToString());
}
return false;
}
#endregion
#region 写入PLC信息
@@ -435,6 +551,13 @@ namespace JinYuan.VirtualDataLibrary
sysConfig.GetMesParam = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "获取MES参数", "false"));
sysConfig.OKSwitching = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "强制OK/正常NG模式切换", "false"));
sysConfig.SaveThreadTime = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "线程耗时日志保存", "false"));
sysConfig.SaveThreadTime = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "线程耗时日志保存", "false"));
mesConfig.Grading1 = IniConfigHelper.ReadIniData("MES配置", "Grading1", "false");
mesConfig.Grading2 = IniConfigHelper.ReadIniData("MES配置", "Grading2", "false");
mesConfig.Grading3 = IniConfigHelper.ReadIniData("MES配置", "Grading3", "false");
mesConfig.Grading4 = IniConfigHelper.ReadIniData("MES配置", "Grading4", "false");
mesConfig.Grading5 = IniConfigHelper.ReadIniData("MES配置", "Grading5", "false");
mesConfig.Grading6 = IniConfigHelper.ReadIniData("MES配置", "Grading6", "false");
}
catch (Exception)
+22
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
namespace JinYuan.VirtualDataLibrary
{
@@ -87,7 +88,28 @@ namespace JinYuan.VirtualDataLibrary
FROM [dbo].[SysAdmin]");
return strSql;
}
/// <summary>
/// 获取RFID对应的B包参数
/// </summary>
/// <param name="strRFID"></param>
/// <returns></returns>
public string GetBGearEntity(string strRFID)
{
string strSql = $@"SELECT `ChannelNo`,`BarCode`,`RFID`,`TestTime`,`CSBYHASCANNINGTIME`,`UpState`,`MaterialCode` FROM `BGearEntity` WHERE `RFID` = '{strRFID}'";
return strSql;
}
public string GetBGearEntityByBarcode(List<string> listBarCode)
{
string strSql = $@"SELECT ChannelNo,[BarCode],[CSBYHASCANNINGTIME],[UpState],[MaterialCode],[CCDResult1],[CCDResult2],[CCDResult3],[CCDResult4],[CCDResult5],[CCDResult6],[CCDResult7],[CCDResult8],[CCDResult9],[CCDResult10],[CCDResult11],[CCDResult12],[CCDResult13],[CCDResult14],[CCDResult15],[CCDResult16],[CCDResult17],[CCDResult18],[CCDResult19],[CCDResult20],[CCDResult21],[CCDResult22],[CCDResult23],[CCDResult24],[CCDResult25],[CCDResult26],[CCDResult27],[CSBYHOUTSTATIONJUDGMENTRESULT],[CSBYHPROCESSNAME],[CSBYHSCHEDULE],[CSBYHINSTATIONTIME],[CSBYHOUTSTATIONTIME],[RethrowNum],[Flag],[Remark],[Result],[ThicknessPLCResult1]
,[ThicknessPLCResult2]
,[ThicknessPLCResult3]
,[ThicknessResult1]
,[ThicknessResult2]
,[ThicknessResult3] FROM BGearEntity WHERE BarCode in ('{string.Join("','", listBarCode)}')";
return strSql;
}
/// <summary>
/// 查询历史数据
/// </summary>
+28
View File
@@ -114,6 +114,30 @@ namespace JinYuan.VirtualDataLibrary
/// Guid
/// </summary>
public string guidStr = "";
/// <summary>
/// OK1分档
/// </summary>
public string Grading1 = "K77";
/// <summary>
/// OK2分档
/// </summary>
public string Grading2 = "K77";
/// <summary>
/// OK3分档
/// </summary>
public string Grading3 = "K77";
/// <summary>
/// OK4分档
/// </summary>
public string Grading4 = "K77";
/// <summary>
/// OK5分档
/// </summary>
public string Grading5 = "K77";
/// <summary>
/// OK6分档
/// </summary>
public string Grading6 = "K77";
/// <summary>
/// 设备状态
@@ -188,6 +212,10 @@ namespace JinYuan.VirtualDataLibrary
/// 设备风速接口
/// </summary>
public string OkNgParamMesUrl = "http://10.17.128.206/core/api/public/eve/pm/eqm/new/grading";
/// <summary>
/// 分档
/// </summary>
public string GradingMesUrl = "http://10.54.50.1:8082/core/api/public/eve/pm/eqm/new/grading";
}
}