From 385ad4ebe09994a0bf9adbf9040e920fb7cab939 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Sun, 1 Oct 2023 08:38:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Commom/Ops.cs      | 30 ++++++++++++++++++++++++++++--
 Rs.SkyLine/Flow/TestCenter.cs | 22 +++++++++++-----------
 Rs.SkyLine/FormMain.cs        | 16 ++++++++--------
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs
index f4894cb..01ed249 100644
--- a/Rs.SkyLine/Commom/Ops.cs
+++ b/Rs.SkyLine/Commom/Ops.cs
@@ -121,13 +121,39 @@ namespace Rs.MotionPlat.Commom
                 Ops.Off("下左相机光源触发");
                 Ops.Off("下右相机光源触发");
                 Ops.Off("上相机光源触发");
-                TakeTrayFlow.Instance.Start();
-                StockManager.Instance.Start();
+                
                 MonitorSystemButton.Instance.Start();
             //});
            
         }
 
+
+        public static void Start()
+        {
+            Task.Run(() => {
+                MachineManage.Instance.MachineStatus = EMachineStatus.Working;
+                TakeTrayFlow.Instance.Start();
+                StockManager.Instance.Start();
+                WorkEnvironment.Instance.Ready();
+                if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne())
+                {
+                    WorkFlow.Instance.Start();
+                    TurnoverFlow.Instance.Start();
+                    MachineManage.Instance.RunState = ERunState.Waiting;
+                    MachineManage.Instance.MachineStatus = EMachineStatus.Working;
+                }
+            });
+        }
+
+        public static void Stop()
+        {
+            WorkFlow.Instance.Stop();
+            TurnoverFlow.Instance.Stop();
+            TakeTrayFlow.Instance.Stop();
+            StockManager.Instance.Stop();
+            MachineManage.Instance.MachineStatus = EMachineStatus.Stop;
+
+        }
         public static bool IsStop(params string[] axies)
         {
             foreach (var axisname in axies)
diff --git a/Rs.SkyLine/Flow/TestCenter.cs b/Rs.SkyLine/Flow/TestCenter.cs
index 1a5a923..6b8fbbe 100644
--- a/Rs.SkyLine/Flow/TestCenter.cs
+++ b/Rs.SkyLine/Flow/TestCenter.cs
@@ -37,17 +37,17 @@ namespace Rs.MotionPlat.Flow
                 case SchedulingStatusInfo.InfoType.State:
                     break;
                 case SchedulingStatusInfo.InfoType.RunStatus:
-                    
-                    WorkEnvironment.Instance.Ready();
-                    Task.Run(() => {
-                        if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne())
-                        {
-                            WorkFlow.Instance.Start();
-                            TurnoverFlow.Instance.Start();
-                            MachineManage.Instance.RunState = ERunState.Waiting;
-                            MachineManage.Instance.MachineStatus = EMachineStatus.Working;
-                        }
-                    });
+                    Ops.Start();
+                    //WorkEnvironment.Instance.Ready();
+                    //Task.Run(() => {
+                    //    if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne())
+                    //    {
+                    //        WorkFlow.Instance.Start();
+                    //        TurnoverFlow.Instance.Start();
+                    //        MachineManage.Instance.RunState = ERunState.Waiting;
+                    //        MachineManage.Instance.MachineStatus = EMachineStatus.Working;
+                    //    }
+                    //});
                     MachineManage.Instance.RunStatus = ERunStatus.Started;
                     MachineManage.Instance.RunState = ERunState.Interrupt;
                     break;
diff --git a/Rs.SkyLine/FormMain.cs b/Rs.SkyLine/FormMain.cs
index 9723dd8..2fc5408 100644
--- a/Rs.SkyLine/FormMain.cs
+++ b/Rs.SkyLine/FormMain.cs
@@ -438,10 +438,12 @@ namespace Rs.MotionPlat
             //SpaceTest.Instance.Start();
             if (MachineManage.Instance.MachineStatus== EMachineStatus.Homed || MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
             {
-                MachineManage.Instance.RunStatus = Commom.ERunStatus.Started;
-                WorkFlow.Instance.Start();
-                TurnoverFlow.Instance.Start();
-                TakeTrayFlow.Instance.Start();
+                //MachineManage.Instance.RunStatus = Commom.ERunStatus.Started;
+                ////WorkFlow.Instance.Start();
+                //TurnoverFlow.Instance.Start();
+                //TakeTrayFlow.Instance.Start();
+
+                Ops.Start();
 
                 //TakeTrayFlow.Instance.Start();
                 //StockManager.Instance.Start();
@@ -454,10 +456,8 @@ namespace Rs.MotionPlat
 
         private void btnStop_BtnClick(object sender, EventArgs e)
         {
-            WorkFlow.Instance.Stop();
-            TurnoverFlow.Instance.Stop();
-            TakeTrayFlow.Instance.Stop();
 
+            Ops.Stop();
             //TakeDumpTest.Instance.Stop();
             //LoadAndUnloadTest.Instance.Stop();
             //TakeTrayTest.Instance.Stop();
@@ -467,7 +467,7 @@ namespace Rs.MotionPlat
             ////CameraTriggerTest.Instance.Stop();
             ////SpaceTest.Instance.Stop();
             //WorkFlow.Instance.Stop();
-            MachineManage.Instance.MachineStatus = EMachineStatus.Stop;
+            //MachineManage.Instance.MachineStatus = EMachineStatus.Stop;
         }
 
         private void timer2_Tick(object sender, EventArgs e)