增加XY1Y2是否到位检测

Rs.DeweyTester/Flow/SafePosFlow/DischargeModuleGoSafePosFlow.cs

@@ -3,6 +3,7 @@ using Rs.Framework;
 using Rs.Motion;
 using Rs.MotionPlat.Commom;
 using Rs.MotionPlat.Entitys;
+using Rs.MotionPlat.Flow.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -169,8 +170,15 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
                         case EDischargeModuleGoSafePosFlowStep.等待运动到安全位:
                             if (Ops.IsStop("LoadX", "LoadY1", "LoadY2") || GlobalVar.VirtualAxis)
                             {
-                                AxisPosPrint.PrintXY1Y2CurrentPos("X已运动到治具安全位,", GetClassName());
-                                arrivedSafePos = true;
+                                if (AxisArrived.LoadXY1Y2IsArrived(targetPos.X, targetPos.Y1, targetPos.Y2))
+                                {
+                                    AxisPosPrint.PrintXY1Y2CurrentPos("X已运动到治具安全位,", GetClassName());
+                                    arrivedSafePos = true;
+                                }
+                                else
+                                {
+                                    moveXStep = EDischargeModuleGoSafePosFlowStep.到安全位;
+                                }
                             }
                             break;
                         default:
@@ -215,8 +223,15 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
                         case EDischargeModuleGoSafePosFlowStep.等待运动到安全位:
                             if (Ops.IsStop("LoadX", "LoadY1", "LoadY2") || GlobalVar.VirtualAxis)
                             {
-                                AxisPosPrint.PrintXY1Y2CurrentPos("Y1已运动治具侧,", GetClassName());
-                                arrivedSafePos = true;
+                                if(AxisArrived.LoadXY1Y2IsArrived(targetPos.X,targetPos.Y1,targetPos.Y2))
+                                {
+                                    AxisPosPrint.PrintXY1Y2CurrentPos("Y1已运动治具侧,", GetClassName());
+                                    arrivedSafePos = true;
+                                }
+                                else
+                                {
+                                    moveY1Step = EDischargeModuleGoSafePosFlowStep.到安全位;
+                                }
                             }
                             break;
                         default: