在TurnoverX和TurnoverY检测轴是否到位处增加捕获日志

Rs.SkyLine/Flow/Common/AxisArrived.cs

@@ -50,14 +50,23 @@ namespace Rs.MotionPlat.Flow.Common
             timer.Start();
             while (timer.ElapsedMilliseconds < 3000)
             {
-                double xCurPos = Ops.GetCurPosition(AxisControl.TurnoverX);
+                try
-                double yCurPos = Ops.GetCurPosition(AxisControl.TurnoverY);
-                if ((Math.Abs(xTargetPos - xCurPos) < AxisControl.TurnoverX.Config.Tolerance
-                    && Math.Abs(yTargetPos - yCurPos) < AxisControl.TurnoverY.Config.Tolerance) || GlobalVar.VirtualAxis)
                 {
-                    timer.Stop();
+                    double xCurPos = Ops.GetCurPosition(AxisControl.TurnoverX);
-                    return true;
+                    double yCurPos = Ops.GetCurPosition(AxisControl.TurnoverY);
+                    if ((Math.Abs(xTargetPos - xCurPos) < AxisControl.TurnoverX.Config.Tolerance
+                        && Math.Abs(yTargetPos - yCurPos) < AxisControl.TurnoverY.Config.Tolerance) || GlobalVar.VirtualAxis)
+                    {
+                        timer.Stop();
+                        return true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Debug($"Fun:TurnoverXYIsInTargetPos {ex.Message}");
+                    return false;
                 }
+                
             }
             timer.Stop();
             return false;

Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs

@@ -1593,10 +1593,10 @@ namespace Rs.MotionPlat.Flow
                             if (AxisArrived.TurnoverXYIsInTargetPos(targetTurnoverX, targetTurnoverY))
                             {
                                 ActionEnd("到治具保压位上方");
+                                logInfo = GetClassName() + $"已运动到测试保压位上方,cx:{Ops.GetCurPosition(AxisControl.TurnoverX)},cy:{Ops.GetCurPosition(AxisControl.TurnoverY)}";
+                                MessageQueue.Instance.Insert(logInfo);
                                 if (TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Count > 0)
                                 {
-                                    logInfo = GetClassName() + $"已运动到测试保压位上方,cx:{Ops.GetCurPosition(AxisControl.TurnoverX)},cy:{Ops.GetCurPosition(AxisControl.TurnoverY)}";
-                                    MessageQueue.Instance.Insert(logInfo);
                                     Step = ETurnoverFlowStep.到测试保压位下方1;
                                 }
                                 else

Rs.SkyLine/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("3.20.24.61")]
+ [assembly: AssemblyVersion("3.20.25.01")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]