设备报警发生时整个设备停止工作。

Rs.SkyLine/Commom/AlarmMessageBox.cs

@@ -78,6 +78,7 @@ namespace Rs.MotionPlat.Commom
         }
         public static ETipButton ShowDialog(bool pause,ETipButton button, Dictionary<ETipButton, string> buttonText,int msgID, params string[] parameters)
         {
+            Ops.Stop();
             AlarmEntity ae = AlarmCollection.Get(msgID).Transform(parameters);
             AlarmItem msg = new AlarmItem();
             msg.Pause = pause;
@@ -92,6 +93,7 @@ namespace Rs.MotionPlat.Commom
 
         public static ETipButton ShowDialog(AlarmEntity alarmEntity,ETipButton button, Dictionary<ETipButton, string> buttonText,bool pause=true)
         {
+            Ops.Stop();
             AlarmItem msg = new AlarmItem();
             msg.Pause = pause;
             msg.NO = alarmEntity.AlarmID;

Rs.SkyLine/Commom/Ops.cs

@@ -155,7 +155,8 @@ namespace Rs.MotionPlat.Commom
             MonitorSystemButton.Instance.Start();
             TestCenter.Instance.Init();
 
-            
+            DischargeFlow.Instance.Init();
+            TurnoverFlow.Instance.Init();
             SysConfigParam.Update("EnableVirtuleBarCode", "False");
             
 

Rs.SkyLine/Flow/SafePosFlow/DischargeModuleGoSafePosFlow.cs

@@ -60,11 +60,11 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
             step = EDischargeModuleGoSafePosFlowStep.到安全位;
             while (true && !finished)
             {
-                if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
+                //if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
-                {
+                //{
-                    Thread.Sleep(10);
+                //    Thread.Sleep(10);
-                    continue;
+                //    continue;
-                }
+                //}
                 switch (step)
                 {
                     case EDischargeModuleGoSafePosFlowStep.到安全位:

Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs

@@ -78,11 +78,11 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
             }
             while (!finished)
             {
-                if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
+                //if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop)
-                {
+                //{
-                    Thread.Sleep(10);
+                //    Thread.Sleep(10);
-                    continue;
+                //    continue;
-                }
+                //}
                 switch (step)
                 {
                     case ETransitModuleSafePosFlowStep.抬起Z轴:

Rs.SkyLine/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("3.20.24.13")]
+ [assembly: AssemblyVersion("3.20.24.14")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]