From 8444c321f43cc47c69050eee386eb36648f62e1f Mon Sep 17 00:00:00 2001 From: lhiven Date: Tue, 23 Jan 2024 11:54:40 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E7=A6=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/MonitorSystemButton.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Rs.SkyLine/Flow/MonitorSystemButton.cs b/Rs.SkyLine/Flow/MonitorSystemButton.cs index 6a66007..fb8d881 100644 --- a/Rs.SkyLine/Flow/MonitorSystemButton.cs +++ b/Rs.SkyLine/Flow/MonitorSystemButton.cs @@ -122,19 +122,13 @@ namespace Rs.MotionPlat.Flow } if(!GlobalVar.DisableDoor) { - signalValue = IoManager.Instance.ReadIn("门禁"); - if (signalValue == 0 && MachineManage.Instance.MachineStatus == EMachineStatus.Working) + signalValue = IoManager.Instance.ReadIn("后安全门禁"); + if (signalValue == 0) { step = EMonitorButtonStep.DoorOpend; break; } } - else if(signalValue==1 && MachineManage.Instance.MachineStatus== EMachineStatus.Stop) - { - MessageQueue.Instance.Insert("门禁已解除"); - break; - } - signalValue = IoManager.Instance.ReadIn("照明"); if (signalValue == 1) { @@ -262,9 +256,10 @@ namespace Rs.MotionPlat.Flow step = EMonitorButtonStep.DoorClosed; break; case EMonitorButtonStep.DoorClosed: - signalValue = IoManager.Instance.ReadIn("门禁"); + signalValue = IoManager.Instance.ReadIn("后安全门禁"); if (signalValue == 1) { + MessageQueue.Instance.Warn("门禁已解除"); step = EMonitorButtonStep.Monitoring; break; }