diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs
index 301e9f6..f53fbe1 100644
--- a/Rs.SkyLine/Commom/GlobalVar.cs
+++ b/Rs.SkyLine/Commom/GlobalVar.cs
@@ -1796,7 +1796,7 @@ namespace Rs.Framework
         /// <summary>
         /// 设备是否是自动状态
         /// </summary>
-        public static bool DeviceIsAuto { get; set; } = true;
+        //public static bool DeviceIsAuto { get; set; } = true;
 
         /// <summary>
         /// Empty2取料盘模式(1、真空吸 2、夹爪 3、真空吸和夹爪)
diff --git a/Rs.SkyLine/Flow/BaseFlow.cs b/Rs.SkyLine/Flow/BaseFlow.cs
index 7eb4d99..3b01093 100644
--- a/Rs.SkyLine/Flow/BaseFlow.cs
+++ b/Rs.SkyLine/Flow/BaseFlow.cs
@@ -35,7 +35,7 @@ namespace Rs.MotionPlat.Flow
         private void task() {
             while (b_IsRun)
             {
-                if(b_IsStop || !GlobalVar.DeviceIsAuto)
+                if(b_IsStop || MachineManage.Instance.RunMode == ERunMode.Manual)
                 {
                     Thread.Sleep(stopWaitTime);
                     continue;
diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
index 924eda0..48e923c 100644
--- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
@@ -158,7 +158,7 @@ namespace Rs.MotionPlat.Flow
         {
             while (run)
             {
-                if(stop || !GlobalVar.DeviceIsAuto)
+                if(stop || MachineManage.Instance.RunMode == ERunMode.Manual)
                 {
                     Thread.Sleep(10);
                     continue;
diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
index bf2dfee..066a224 100644
--- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
@@ -211,7 +211,7 @@ namespace Rs.MotionPlat.Flow
         {
             while (run)
             {
-                if(stop || !GlobalVar.DeviceIsAuto)
+                if(stop || MachineManage.Instance.RunMode == ERunMode.Manual)
                 {
                     Thread.Sleep(10);
                     continue;
diff --git a/Rs.SkyLine/FormMain.cs b/Rs.SkyLine/FormMain.cs
index f2e8c48..997dcf6 100644
--- a/Rs.SkyLine/FormMain.cs
+++ b/Rs.SkyLine/FormMain.cs
@@ -178,6 +178,14 @@ namespace Rs.MotionPlat
                 if (btnWholeHome.Visible == false)
                     btnWholeHome.Visible = true;
             }
+            if(MachineManage.Instance.RunMode== ERunMode.Automatic && !switchButton1.Checked)
+            {
+                switchButton1.Checked = true;
+            }
+            else if (MachineManage.Instance.RunMode == ERunMode.Manual && switchButton1.Checked)
+            {
+                switchButton1.Checked = false;
+            }
         }
 
         private void FormMain_Load(object sender, EventArgs e)
@@ -269,7 +277,7 @@ namespace Rs.MotionPlat
             //StockManager.Instance.Start();
             LoadStockStatus();
             HOperatorSet.ReadImage(out defaultImage, "default.bmp");
-            switchButton1.Checked = GlobalVar.DeviceIsAuto;
+            switchButton1.Checked = MachineManage.Instance.RunMode == ERunMode.Automatic;
         }
         
         /// <summary>
@@ -653,7 +661,15 @@ namespace Rs.MotionPlat
 
         private void switchButton1_Click(object sender, EventArgs e)
         {
-            GlobalVar.DeviceIsAuto = switchButton1.Checked;
+            //GlobalVar.DeviceIsAuto = switchButton1.Checked;
+            if(switchButton1.Checked)
+            {
+                MachineManage.Instance.RunMode = ERunMode.Automatic;
+            }
+            else
+            {
+                MachineManage.Instance.RunMode = ERunMode.Manual;
+            }
         }
     }
 }
diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs
index cb3c394..02ac011 100644
--- a/Rs.SkyLine/Properties/AssemblyInfo.cs
+++ b/Rs.SkyLine/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("3.20.24.31")]
+ [assembly: AssemblyVersion("3.20.24.32")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]