diff --git a/Rs.DeweyTester/Commom/GlobalVar.cs b/Rs.DeweyTester/Commom/GlobalVar.cs index d97eda8..c95c907 100644 --- a/Rs.DeweyTester/Commom/GlobalVar.cs +++ b/Rs.DeweyTester/Commom/GlobalVar.cs @@ -432,7 +432,7 @@ namespace Rs.Framework { get { - return SysConfigParam.GetValue(nameof(EnableTC6)); + return SysConfigParam.GetValue(nameof(IsSimTest)); } } diff --git a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs index 10a385d..2ba8466 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs @@ -392,7 +392,10 @@ namespace Rs.MotionPlat.Flow } else { - flowStep = EGrrFlowStep.到治具取料位上方; + if(!string.IsNullOrEmpty(curFixture.Product.Result)) + { + flowStep = EGrrFlowStep.到治具取料位上方; + } } } break;