From d7ec501d0543f573c7d6a2b215176b13b2a703d3 Mon Sep 17 00:00:00 2001
From: lhiven <2366881222@qq.com>
Date: Thu, 28 Dec 2023 12:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AE=B5=E9=80=9F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
index 39f197e..61f71ae 100644
--- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
@@ -374,12 +374,14 @@ namespace Rs.MotionPlat.Flow
                     if(GlobalVar.EnableTwoSpeed)
                     {
                         targetPos = SysConfigParam.GetValue<double>("TurnoverTakeZ") + GlobalVar.CloseVacOffsetHeight;
+                        errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
                     }
                     else
                     {
                         targetPos = SysConfigParam.GetValue<double>("TurnoverSafeZ");
+                        errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.WholeSpeed);
                     }
-                    errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.WholeSpeed);
+                    
                     if (errCode == Motion.ErrorCode.Ok || GlobalVar.VirtualAxis)
                     {
                         if (GlobalVar.VirtualAxis)
@@ -1005,14 +1007,6 @@ namespace Rs.MotionPlat.Flow
 
                
                 case ETurnoverFlowStep.测试完成抬起到高速位:
-                    if(GlobalVar.EnableTwoSpeed)
-                    {
-                        targetPos = SysConfigParam.GetValue<double>("PressZ") + GlobalVar.PressLowSpeedOffset;
-                    }
-                    else
-                    {
-                        targetPos = SysConfigParam.GetValue<double>("PressSafeZ");
-                    }
                     double curPos = Ops.GetCurPosition(AxisAlias.PressZ);
                     if(Math.Abs(curPos-targetPos)<0.1)
                     {
@@ -1020,7 +1014,16 @@ namespace Rs.MotionPlat.Flow
                     }
                     else
                     {
-                        errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
+                        if (GlobalVar.EnableTwoSpeed)
+                        {
+                            targetPos = SysConfigParam.GetValue<double>("PressZ") + GlobalVar.PressLowSpeedOffset;
+                            errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
+                        }
+                        else
+                        {
+                            targetPos = SysConfigParam.GetValue<double>("PressSafeZ");
+                            errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.WholeSpeed);
+                        }
                         if (errCode == Motion.ErrorCode.Ok || GlobalVar.VirtualAxis)
                         {
                             if (GlobalVar.VirtualAxis)
@@ -1611,12 +1614,14 @@ namespace Rs.MotionPlat.Flow
                     if(GlobalVar.EnableTwoSpeed)
                     {
                         targetPos = SysConfigParam.GetValue<double>("TurnoverTakeZ") + GlobalVar.PressLowSpeedOffset;
+                        errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
                     }
                     else
                     {
                         targetPos = SysConfigParam.GetValue<double>("TurnoverSafeZ");
+                        errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.WholeSpeed);
                     }
-                    errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
+                   
                     if(errCode == Motion.ErrorCode.Ok || GlobalVar.VirtualAxis)
                     {
                         if (GlobalVar.VirtualAxis)