增加门禁功能

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;
                     }