From 114ffafeeb20ef7066cb2e2882bb58b96f791ab5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 20 十月 2025 11:33:11 +0800
Subject: [PATCH] 提交数据
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
index 95d36b1..6673b39 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
@@ -87,7 +87,6 @@
//var devices = GetDevicesByDeptId(deid);
-
if (devices != null)
{
// Left PLC processing
@@ -100,7 +99,7 @@
var leftscram = devices.Value.left.Communicator.Read<bool>("M110"); // Emergency stop
var leftstop = devices.Value.left.Communicator.Read<bool>("M120"); // Obstacle stop
- var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80");
+ var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80"); //褰撳墠浣嶇疆
Console.WriteLine($"{devices.Value.left.DeviceName}:鍗′綇鎶ヨ{leftPLcstuck1}锛屽叾浠栨姤璀leftPLcOher1}");
@@ -154,7 +153,7 @@
{
device = "宸lc",
Liftvalue = leftPLcNowAdd
- }));
+ })); //杩斿洖褰撳墠plc浣嶇疆
}
}
catch (Exception)
@@ -172,6 +171,7 @@
var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M111"); // Other alarm
var rightscram = devices.Value.right.Communicator.Read<bool>("M110"); // Emergency stop
var rightstop = devices.Value.right.Communicator.Read<bool>("M120"); // Obstacle stop
+
var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80");
Console.WriteLine($"{devices.Value.right.DeviceName}:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
@@ -236,7 +236,7 @@
}
var alrt = _alarmResetHsyServer.GetWebSocketInfo(deid);
- _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));
+ _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt)); //杩斿洖鎵�鏈夌殑鎶ヨ琛ㄧ殑淇℃伅
}
}
}
@@ -251,7 +251,7 @@
return Task.CompletedTask;
}
-
+
public (OtherDevice left, OtherDevice right)? GetDevicesByDeptId(int deptId)
{
--
Gitblit v1.9.3