不启用二段速时，真空破改为在下面时关闭

Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs

@@ -476,6 +476,7 @@ namespace Rs.MotionPlat.Flow
                                 if (curTask.FromType == TurnoverType.Turnover)
                                 {
                                     VacManager.TurnoverTrayVacBreak(EVacOperator.Open, true, curNozzle.FromIndex + 1);
+                                    VacManager.TurnoverTrayVacBreak(EVacOperator.Close, false, curNozzle.FromIndex + 1);
                                 }
                                 else
                                 {
@@ -555,7 +556,7 @@ namespace Rs.MotionPlat.Flow
                             if (curTask.FromType == TurnoverType.Turnover)
                             {
                                 ///周转盘取料抬起后把真空破关闭,这里关破真空不等待
-                                VacManager.TurnoverTrayVacBreak(EVacOperator.Close, false, curNozzle.FromIndex + 1);
+                                //VacManager.TurnoverTrayVacBreak(EVacOperator.Close, false, curNozzle.FromIndex + 1);
                             }
                             flowStep = EDischargeFlowStep.取料完成后真空检测;
                         }

Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs

@@ -615,6 +615,11 @@ namespace Rs.MotionPlat.Flow
                                     VacManager.TurnoverTrayVacSuction(EVacOperator.Close, true, undealTasks.Select(t => t.FromIndex + 1).ToArray());
                                     /*打开周转盘真空破*/
                                     VacManager.TurnoverTrayVacBreak(EVacOperator.Open, true, undealTasks.Select(t => t.FromIndex + 1).ToArray());
+                                    if (!GlobalVar.TurnoverTrayTakeEnableTwoSpeed)
+                                    {
+                                        /*关闭周转盘真空破*/
+                                        VacManager.TurnoverTrayVacBreak(EVacOperator.Close, false, undealTasks.Select(t => t.FromIndex + 1).ToArray());
+                                    }
                                     ActionEnd("关闭周转盘真空吸-打开周转盘真空破");
                                     Step = ETurnoverFlowStep.周转盘取料完成抬起1;
                                 }
@@ -2434,6 +2439,11 @@ namespace Rs.MotionPlat.Flow
                                     VacManager.TestTrayVacSuction(EVacOperator.Close, true, undealTasks.Select(t => t.FromIndex + 1).ToArray());
                                     /*打开测试穴位真空破*/
                                     VacManager.TestTrayVacBreak(EVacOperator.Open, true, undealTasks.Select(t => t.FromIndex + 1).ToArray());
+                                    if (!GlobalVar.SocketTrayTakeEnableTwoSpeed)
+                                    {
+                                        /*关闭测试穴位真空破*/
+                                        VacManager.TestTrayVacBreak(EVacOperator.Close, false, undealTasks.Select(t => t.FromIndex + 1).ToArray());
+                                    }
                                     ActionEnd("关闭测试穴位真空吸-打开测试穴位真空破");
                                     Step = ETurnoverFlowStep.测试位取料完成抬起1;
                                 }

Rs.SkyLine/Home.cs

@@ -23,6 +23,7 @@ using System.Diagnostics;
 using System.IO;
 using Rs.MotionPlat.Entitys;
 using static Rs.MotionPlat.Commom.SchedulingMessageBox;
+using ICSharpCode.SharpZipLib.Zip;
 
 namespace Rs.MotionPlat
 {
@@ -565,6 +566,19 @@ namespace Rs.MotionPlat
                             fanAlarm = false;
                         }
                     }
+                    else
+                    {
+                        if (Ops.IsOn("1号离子风报警")==false
+                            && Ops.IsOn("2号离子风报警") == false
+                            && Ops.IsOn("3号离子风报警") == false
+                            && Ops.IsOn("4号离子风报警") == false
+                            && Ops.IsOn("5号离子风报警") == false
+                            && Ops.IsOn("6号离子风报警") == false)
+                        {
+                            fanAlarm = false;
+                            PromptMessageBox.CloseWindow(AlarmConstID.离子风扇报警, ETipButton.None);
+                        }
+                    }
                 }
             }
 

Rs.SkyLine/Properties/AssemblyInfo.cs

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