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")]