yanjinhui
2025-10-20 114ffafeeb20ef7066cb2e2882bb58b96f791ab5
ÏîÄ¿´úÂë/ºó¶Ë/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 = "å·¦Plc",
                                        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)
        {