From d50705857eafc56c122a87a009ed2eb5db564c04 Mon Sep 17 00:00:00 2001 From: lhiven Date: Sat, 20 Jul 2024 07:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=AF=E7=94=A8=E4=BA=8C=E6=AE=B5?= =?UTF-8?q?=E9=80=9F=E6=97=B6=EF=BC=8C=E7=9C=9F=E7=A9=BA=E7=A0=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=9C=A8=E4=B8=8B=E9=9D=A2=E6=97=B6=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 3 ++- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 10 ++++++++++ Rs.SkyLine/Home.cs | 14 ++++++++++++++ Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index a297ef3..835281c 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/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.取料完成后真空检测; } diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 066a224..d3d0558 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/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; } diff --git a/Rs.SkyLine/Home.cs b/Rs.SkyLine/Home.cs index 85dc2d9..76a6d5c 100644 --- a/Rs.SkyLine/Home.cs +++ b/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); + } + } } } diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 6935f82..f5062db 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.34")] + [assembly: AssemblyVersion("3.20.24.35")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]