SoftwareGroup/602_WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MES对接

Browse Source
This commit is contained in:
a88359121
2025-07-29 15:14:39 +08:00
parent c45e3622af
commit a1ba7e36a3
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.ControlCenter/ControlCenter.cs
+20 -7
View File
@@ -47,7 +47,7 @@ namespace JinYuan.ControlCenters
Directory.CreateDirectory(filePath); Directory.CreateDirectory(filePath);
} }
string logMessage = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")}: {Message}";//打印出现的时间 string logMessage = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")}: {Message}";//打印出现的时间
// 将消息写入日志文件 // 将消息写入日志文件
using (StreamWriter writer = new StreamWriter(filePath2, true)) using (StreamWriter writer = new StreamWriter(filePath2, true))
{ {
writer.WriteLine(logMessage); writer.WriteLine(logMessage);
@@ -138,9 +138,9 @@ namespace JinYuan.ControlCenters
{ {
DicStationFunction = new Dictionary<string, dgStationFunction>(); DicStationFunction = new Dictionary<string, dgStationFunction>();
DicStationFunction.Add("外观检测进站", FeedingStation); DicStationFunction.Add("电芯进站", FeedingStation);
DicStationFunction.Add("NG出站", NGStation); //DicStationFunction.Add("NG出站", NGStation);
DicStationFunction.Add("外观检测出站", BlankingStation); //DicStationFunction.Add("外观检测出站", BlankingStation);
for (int i = 0; i < CommonMethods.ChatLineCount; i++) for (int i = 0; i < CommonMethods.ChatLineCount; i++)
{ {
@@ -245,7 +245,7 @@ namespace JinYuan.ControlCenters
//as 类型转换 //as 类型转换
Group pf = plcModel as Group; Group pf = plcModel as Group;
bool sta = CommonMethods.IsExit; bool sta = CommonMethods.IsExit;
while (!CommonMethods.IsExit) while (!CommonMethods.IsExit)
{ {
CommonMethods.ResetEventRecv.WaitOne(); CommonMethods.ResetEventRecv.WaitOne();
if (CommonMethods.IsRun) if (CommonMethods.IsRun)
@@ -273,7 +273,20 @@ namespace JinYuan.ControlCenters
} }
else else
{ {
DicStationFunction[pf.GroupName].BeginInvoke(resByte, pf, null, null);//信息解析 //if (DicStationFunction.TryGetValue(pf.GroupName, out var func))
//{
// func.BeginInvoke(resByte, pf, ar =>
// {
// try { func.EndInvoke(ar); }
// catch (Exception ex)
// {
// CommonMethods.AddLog(true, ex.Message);
// LogHelper.Instance.WriteEX(ex);
// }
// }, null);
//}
//// private Dictionary<string, dgStationFunction> DicStationFunction;
DicStationFunction[pf.GroupName].BeginInvoke(resByte, pf, null, null);//信息解析
} }
} }
} }
@@ -1003,7 +1016,7 @@ namespace JinYuan.ControlCenters
CommonMethods.Ppm = CommonMethods.PlcLink.ReadInt32("D13"); CommonMethods.Ppm = CommonMethods.PlcLink.ReadInt32("D13");
//CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadFloat("D11").ToString("F2"))/100; //CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadFloat("D11").ToString("F2"))/100;
CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadInt32("D11").ToString("F2"))/100; CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadInt32("D11").ToString("F2")) / 100;
#region 开机时间/运行时间 #region 开机时间/运行时间
CommonMethods.PlcOpenAndRunTime = GetList<int>(6, 0); CommonMethods.PlcOpenAndRunTime = GetList<int>(6, 0);
JinYuan.MES/MESApiHelper.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace JinYuan.MES
StringContent stringContent = new StringContent(strJosnData, Encoding.UTF8, "application/json"); StringContent stringContent = new StringContent(strJosnData, Encoding.UTF8, "application/json");
string ResponseMessage= new HttpClient() string ResponseMessage= new HttpClient()
{ {
Timeout = TimeSpan.FromSeconds(6.0) Timeout = TimeSpan.FromSeconds(3.0)
}.PostAsync(url, (HttpContent)stringContent).Result.Content.ReadAsStringAsync().Result; }.PostAsync(url, (HttpContent)stringContent).Result.Content.ReadAsStringAsync().Result;
return ResponseMessage; return ResponseMessage;
} }
LargeSquareOne/FrmMonitor.cs
+1 -1
View File
@@ -117,7 +117,7 @@ namespace LargeSquareOne
using (new TimerReset(m_RefreshTimer, 2000)) using (new TimerReset(m_RefreshTimer, 2000))
{ {
Refish12ProdQty(); Refish12ProdQty();
RefreshXiaoLvData(); RefreshXiaoLvData();//设备综合效率
RefreshChatTop10AlarmData(); RefreshChatTop10AlarmData();
RefreshChatNGData(); RefreshChatNGData();
} }