增加门禁功能

Rs.SkyLine/Commom/GlobalVar.cs

@@ -907,5 +907,13 @@ namespace Rs.Framework
                 return true;
             }
         }
+
+        public static bool DisableDoor
+        {
+            get
+            {
+                return true;
+            }
+        }
     }
 }

Rs.SkyLine/Flow/MonitorSystemButton.cs

@@ -119,10 +119,18 @@ namespace Rs.MotionPlat.Flow
                         step = EMonitorButtonStep.ResetButtonPressed;
                         break;
                     }
-                    signalValue = IoManager.Instance.ReadIn("光栅门禁开关");
+                    if(!GlobalVar.DisableDoor)
-                    if(signalValue==0 && MachineManage.Instance.MachineStatus== EMachineStatus.Working)
                     {
-                        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();
+                    Ops.Stop();
-                    DischargeFlow.Instance.Stop();
+                    MessageQueue.Instance.Warn("门禁被触发");
-                    MachineManage.Instance.NeedRestoreMove = true;
-                    MachineManage.Instance.MachineStatus= EMachineStatus.Stop;
-                    MessageQueue.Instance.Insert("光栅门禁被触发");
                     step = EMonitorButtonStep.Monitoring;
                     break;
                 case EMonitorButtonStep.LightButtonPressed: