From fcd49db2ee33ee2e1d33e5a41e53d9897a8a3b0f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 05 六月 2025 19:19:10 +0800
Subject: [PATCH] 限制plc伸到位报警，和限制开始作业无限点击问题
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
index 7e96004..b7393c0 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
@@ -68,20 +68,20 @@
{
string text = $"杞ㄩ亾{deid}锛氫几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid,text, leftPLcstuck1);
}
if (leftPLcstuck1 == false && leftPLcOher1 == true)
{
string text = $"杞ㄩ亾{deid}锛氬叾浠栨晠闅滄姤璀�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcstuck1);
}
if (leftPLcstuck1 == true && leftPLcOher1 == true)//濡傛灉鎶ヨ浜�
{
string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcstuck1);
}
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new
{
@@ -93,7 +93,7 @@
catch (Exception)
{
string text = $"杞ㄩ亾{deid}锛氬乏PLC鏈繛鎺�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//娣诲姞鏁版嵁
+ //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false);//娣诲姞鏁版嵁
}
try
@@ -109,18 +109,18 @@
{
string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcSuck);
// _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
}
if (rightPLcOher == false && rightPLcSuck == true)
{
string text = $"杞ㄩ亾{deid}锛氬叾浠栨晠闅滄姤璀�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcOher);
}
if (rightPLcSuck == true && rightPLcOher == true)//濡傛灉鎶ヨ浜�
{
string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//娣诲姞鏁版嵁
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcOher);//娣诲姞鏁版嵁
}
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new {
device="鍙砅lc",
@@ -132,9 +132,9 @@
catch (Exception)
{
string text = $"杞ㄩ亾{deid}锛氬彸PLC鏈繛鎺�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//娣诲姞鏁版嵁
+ //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false);//娣诲姞鏁版嵁
}
- var alrt = _alarmResetHsyServer.GetWebSocketInfo();
+ var alrt = _alarmResetHsyServer.GetWebSocketInfo(deid);
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));
}
--
Gitblit v1.9.3