From 731bbe09988d280b6a173dd33ce7f217c3a76be4 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Sun, 23 Jun 2024 17:54:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8DIsSimTest=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98=202?=
 =?UTF-8?q?=E3=80=81=E7=AD=89=E5=BE=85=E6=B2=BB=E5=85=B7=E5=B0=B1=E7=BB=AA?=
 =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Commom/GlobalVar.cs        | 2 +-
 Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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<bool>(nameof(EnableTC6));
+                return SysConfigParam.GetValue<bool>(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;