From b96e4087d36c91ed1f89fd1fe041477eff219f85 Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 7 Aug 2024 22:02:08 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=89=AF=E7=8E=87=E9=97=AE=E9=A2=98=202?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0GRR=E6=B5=8B=E8=AF=95=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E5=88=A4=E6=96=AD=E5=93=AA=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=98=AF=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=B2=BB=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Entitys/SimulateTesterManager.cs | 2 +- Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs | 15 +++++++++++++++ Rs.DeweyTester/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Rs.DeweyTester/Entitys/SimulateTesterManager.cs b/Rs.DeweyTester/Entitys/SimulateTesterManager.cs index 6198d72..1127d52 100644 --- a/Rs.DeweyTester/Entitys/SimulateTesterManager.cs +++ b/Rs.DeweyTester/Entitys/SimulateTesterManager.cs @@ -70,7 +70,7 @@ namespace Rs.MotionPlat.Entitys } else { - res = 0; + res = 1; } testResult = $"Result#0#{res}#CsvInfo#FailItems#TestItems#BinInfo$"; } diff --git a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs index 21f0cdc..f485669 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs @@ -175,6 +175,21 @@ namespace Rs.MotionPlat.Flow case EGrrFlowStep.等待启动: needGrrFixtureList.Clear(); needGrrFixtureList = TestFixtureManager.Instance.GetEnableFixtureList(); + if(needGrrFixtureList != null) + { + int i = 0; + foreach (TestFixture testFixture in needGrrFixtureList) + { + if(i==0) + { + needGrrFixtureList[i].IsFirstFixture = true; + } + else + { + needGrrFixtureList[i].IsFirstFixture = false; + } + } + } flowStep = EGrrFlowStep.判断是否需要从料仓取料; break; #region 料仓取料 diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index bc696e0..36fdf41 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("1.20.24.06")] + [assembly: AssemblyVersion("1.20.24.07")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]