From 34ba789b36cf3efad277eff0f02deba4ca51cdd0 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Sat, 3 Feb 2024 10:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E9=87=8D=E6=96=B0=E6=89=93=E5=BC=80=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=20=20=E5=90=AF=E5=8A=A8=E8=AE=BE=E5=A4=87=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E5=AE=89=E5=85=A8=E9=97=A8=E6=89=93=E5=BC=80=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=AE=BE=E5=A4=87=E8=83=BD=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Commom/Ops.cs | 62 +++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs
index 1b00b30..7d97e8d 100644
--- a/Rs.SkyLine/Commom/Ops.cs
+++ b/Rs.SkyLine/Commom/Ops.cs
@@ -152,39 +152,47 @@ namespace Rs.MotionPlat.Commom
 
         public static void Start()
         {
-            bool run = true;
-            if(GlobalVar.EnableVirtuleBarCode)
+            //先检测门禁
+            if(IoManager.Instance.ReadIn("后安全门禁")==0)
             {
-                DialogResult dr = Msg.ShowQuestion("device run use virtual bar code?");
-                if(dr== DialogResult.Cancel)
-                {
-                    run = false;
-                }
+                MessageQueue.Instance.Warn("door opened,please close door!!!");
             }
-            if(run)
+            else
             {
-                Task.Run(() => {
-                    if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed || MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
+                bool run = true;
+                if (GlobalVar.EnableVirtuleBarCode)
+                {
+                    DialogResult dr = Msg.ShowQuestion("device run use virtual barcode?");
+                    if (dr == DialogResult.Cancel)
                     {
-                        MachineManage.Instance.SetLocalMachineStatus(EMachineStatus.Working);
-                        On("启动灯");
-                        Off("停止灯");
-                        LightManger.Instance.SetStatus(ELightStatus.Green);
-                        if (!WorkEnvironment.Instance.IsRunning())
-                        {
-                            WorkEnvironment.Instance.Ready();
-                        }
-                        WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne();
-                        DischargeFlow.Instance.Start();
-                        TurnoverFlow.Instance.Start();
-                        MachineManage.Instance.SetCenterMachineStatus(ERunStatus.Started);
-                        //if (DischargeFlow.Instance.GetCurStep() == "等待任务" && TurnoverFlow.Instance.GetStep() == "等待任务")
-                        if (MachineManage.Instance.GetLoadUnloadStatus() != ERunState.Busying)
+                        run = false;
+                    }
+                }
+                if (run)
+                {
+                    Task.Run(() => {
+                        if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed || MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
                         {
-                            MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting);
+                            MachineManage.Instance.SetLocalMachineStatus(EMachineStatus.Working);
+                            On("启动灯");
+                            Off("停止灯");
+                            LightManger.Instance.SetStatus(ELightStatus.Green);
+                            if (!WorkEnvironment.Instance.IsRunning())
+                            {
+                                WorkEnvironment.Instance.Ready();
+                            }
+                            WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne();
+                            DischargeFlow.Instance.Start();
+                            TurnoverFlow.Instance.Start();
+                            MachineManage.Instance.SetCenterMachineStatus(ERunStatus.Started);
+                            //if (DischargeFlow.Instance.GetCurStep() == "等待任务" && TurnoverFlow.Instance.GetStep() == "等待任务")
+                            if (MachineManage.Instance.GetLoadUnloadStatus() != ERunState.Busying)
+                            {
+                                MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting);
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
         }