From 354453fa2ae8ed2942c16fdc7c5d1ea76540f944 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Mon, 24 Feb 2025 14:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=86=99=E5=85=A5devlog=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=8C=BA=E5=88=86=E6=98=AF=E4=BB=8E?=
 =?UTF-8?q?=E6=B2=BB=E5=85=B7=E5=88=B0=E6=96=99=E4=BB=93=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?=E4=BB=8E=E6=96=99=E4=BB=93=E5=88=B0=E6=B2=BB=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs | 11 ++++++++++-
 Rs.DeweyTester/Flow/SubFlow/StockPlaceFlow.cs   |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
index ef7935d..dd1269c 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
@@ -119,6 +119,10 @@ namespace Rs.MotionPlat.Flow
         /// </summary>
         //private int lastFixtureIndex = 0;
         List<int> checkFixtureList = new List<int>();
+        /// <summary>
+        /// 从料仓到治具
+        /// </summary>
+        string acrossAnthorSide = "";
         public void Init()
         {
             mainTask = new Task(Run);
@@ -486,6 +490,11 @@ namespace Rs.MotionPlat.Flow
                         //    DischargeModuleGoSafePosFlow.Instance.GoSafePostion(ESafePosSide.PlaceToFixture);
                         //}
                         ActionStart();
+                        acrossAnthorSide = "";
+                        if(Math.Abs(targetPosition.Y1-GlobalVar.FixtureSideY1)>50)
+                        {
+                            acrossAnthorSide = " (1)";
+                        }
                         if(GroupAxisMove.XY1Y2MovePos(targetPosition, GlobalVar.WholeSpeed, EGoWhichSide.FixtureSide))
                         {
                             AxisPosPrint.PrintXY1Y2TargetPos("到治具放料缓冲位,", targetPosition, GetClassName());
@@ -495,7 +504,7 @@ namespace Rs.MotionPlat.Flow
                     case EDischargeFlowStep.等待到治具取料等待位:
                         if(Ops.IsStop("LoadX","LoadY1","LoadY2"))
                         {
-                            ActionEnd("拾取器移动到另一个治具", "Picker move to another test cell (2nd)");
+                            ActionEnd("拾取器移动到另一个治具", $"Picker move to another test cell{acrossAnthorSide}");
                             AxisPosPrint.PrintXY1Y2CurrentPos("轴loadx,loady1,loady2已停止运动,",GetClassName());
                             if(AxisArrived.LoadXY1Y2IsArrived(targetPosition.X, targetPosition.Y1, targetPosition.Y2))
                             {
diff --git a/Rs.DeweyTester/Flow/SubFlow/StockPlaceFlow.cs b/Rs.DeweyTester/Flow/SubFlow/StockPlaceFlow.cs
index f133362..b00e54d 100644
--- a/Rs.DeweyTester/Flow/SubFlow/StockPlaceFlow.cs
+++ b/Rs.DeweyTester/Flow/SubFlow/StockPlaceFlow.cs
@@ -99,6 +99,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
             TargetPosition targetPosition = new TargetPosition();
             Nozzle curNozzle = NozzleManager.GetNozzle(nozzleIndex);
             TraySlot curPlaceSlot = null;
+            string acrossAnthorSide = "";
             DischargeFlow.Instance.ActionStart();
             while (!finished)
             {
@@ -136,6 +137,10 @@ namespace Rs.MotionPlat.Flow.SubFlow
                                 //{
                                 //    DischargeModuleGoSafePosFlow.Instance.GoSafePostion(ESafePosSide.PlaceToStock);
                                 //}
+                                if(Math.Abs(targetPosition.Y1-GlobalVar.StockSideY1)>50)
+                                {
+                                    acrossAnthorSide = " (1)";
+                                }
                                 if (GroupAxisMove.XY1Y2MovePos(targetPosition, GlobalVar.WholeSpeed, EGoWhichSide.StockSide))
                                 {
                                     AxisPosPrint.PrintXY1Y2TargetPos($"到{trayType}料仓拍照位上方,", targetPosition, GetClassName());
@@ -320,7 +325,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
                     case EStockPlaceFlowStep.放料完成:
                         try
                         {
-                            DischargeFlow.Instance.ActionEnd("拾取器将 1 个 DUT 卸载到output托盘（OK/NG）", "Picker unload 1 DUT to output trav (OK/NG)");
+                            DischargeFlow.Instance.ActionEnd("拾取器将 1 个 DUT 卸载到output托盘（OK/NG）", $"Picker unload 1 DUT to output trav (OK/NG){acrossAnthorSide}");
                             if (curNozzle.Product != null)
                             {
                                 curNozzle.Product.ToSlotIndex = curPlaceSlot.Index;