From d32fcdbc4300d50d3bd3f75dbfea6b6fcadd0536 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Fri, 23 Feb 2024 08:06:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=B4=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E6=B2=BB=E5=85=B7=E6=AE=8B=E7=95=99=E6=A3=80=E6=B5=8B=202?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=9A?= =?UTF-8?q?2.20.24.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 7 +++++-- Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs | 2 +- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 140a21b..cee796d 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -2180,9 +2180,12 @@ namespace Rs.MotionPlat.Flow VacManager.TestTrayVacSuction(EVacOperator.Open, true, TestTrayManager.Instance.Slots.Select(s => s.Index).ToArray()); foreach (TestTraySlot slot in TestTrayManager.Instance.Slots) { - if (Ops.IsOn($"测试{slot.Index}号穴位真空吸检测")) + if(!GlobalVar.DisableFixtureVacuumCheck) { - testTrayHasProductList.Add(slot.Index); + if (Ops.IsOn($"测试{slot.Index}号穴位真空吸检测")) + { + //testTrayHasProductList.Add(slot.Index); + } } } VacManager.TestTrayVacSuction(EVacOperator.Close, true, TestTrayManager.Instance.Slots.Select(s => s.Index).ToArray()); diff --git a/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs b/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs index d7e55e8..5e5b022 100644 --- a/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs +++ b/Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs @@ -352,7 +352,7 @@ namespace Rs.MotionPlat.Flow.SubFlow singleResult.SlotIndex = SlotIndex; exit = true; logInfo = GetClassName() + "拍照处理完成"; - MessageQueue.Instance.Warn(logInfo); + MessageQueue.Instance.Insert(logInfo); break; } } diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 0014efd..0311f99 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("2.20.24.11")] + [assembly: AssemblyVersion("2.20.24.15")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]