From 84009e0691534d0e8bb813f73e0cde61521b0f75 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Thu, 4 Jan 2024 15:15:48 +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/Commom/GlobalVar.cs         |  8 ++++++++
 Rs.SkyLine/Flow/MonitorSystemButton.cs | 21 +++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs
index d6a6691..9af9d43 100644
--- a/Rs.SkyLine/Commom/GlobalVar.cs
+++ b/Rs.SkyLine/Commom/GlobalVar.cs
@@ -907,5 +907,13 @@ namespace Rs.Framework
                 return true;
             }
         }
+
+        public static bool DisableDoor
+        {
+            get
+            {
+                return true;
+            }
+        }
     }
 }
diff --git a/Rs.SkyLine/Flow/MonitorSystemButton.cs b/Rs.SkyLine/Flow/MonitorSystemButton.cs
index 6c4d8f5..edaefe4 100644
--- a/Rs.SkyLine/Flow/MonitorSystemButton.cs
+++ b/Rs.SkyLine/Flow/MonitorSystemButton.cs
@@ -119,10 +119,18 @@ namespace Rs.MotionPlat.Flow
                         step = EMonitorButtonStep.ResetButtonPressed;
                         break;
                     }
-                    signalValue = IoManager.Instance.ReadIn("光栅门禁开关");
-                    if(signalValue==0 && MachineManage.Instance.MachineStatus== EMachineStatus.Working)
+                    if(!GlobalVar.DisableDoor)
                     {
-                        step = EMonitorButtonStep.DoorOpend;
+                        signalValue = IoManager.Instance.ReadIn("门禁");
+                        if (signalValue == 0 && MachineManage.Instance.MachineStatus == EMachineStatus.Working)
+                        {
+                            step = EMonitorButtonStep.DoorOpend;
+                            break;
+                        }
+                    }
+                    else if(signalValue==1 && MachineManage.Instance.MachineStatus== EMachineStatus.Stop)
+                    {
+                        MessageQueue.Instance.Insert("门禁已解除");
                         break;
                     }
 
@@ -248,11 +256,8 @@ namespace Rs.MotionPlat.Flow
                     }
                     break;
                 case EMonitorButtonStep.DoorOpend:
-                    //AxisManager.AllStop();
-                    DischargeFlow.Instance.Stop();
-                    MachineManage.Instance.NeedRestoreMove = true;
-                    MachineManage.Instance.MachineStatus= EMachineStatus.Stop;
-                    MessageQueue.Instance.Insert("光栅门禁被触发");
+                    Ops.Stop();
+                    MessageQueue.Instance.Warn("门禁被触发");
                     step = EMonitorButtonStep.Monitoring;
                     break;
                 case EMonitorButtonStep.LightButtonPressed: