From 9031fb672c93791fc97ebc22ab3b767366134c4a Mon Sep 17 00:00:00 2001
From: lhiven <2366881222@qq.com>
Date: Wed, 24 Jan 2024 08:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E6=B2=BB=E5=85=B7=E5=A4=849-16?=
 =?UTF-8?q?=E6=9C=89=E6=8A=A5=E8=AD=A6=E6=97=B6=EF=BC=8CX=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B0=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E7=A9=B4?=
 =?UTF-8?q?=E4=BD=8D=E5=A4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Commom/Enums.cs                              | 4 ++++
 Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs              | 9 ++++++++-
 Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs | 5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Rs.SkyLine/Commom/Enums.cs b/Rs.SkyLine/Commom/Enums.cs
index 0337fa1..2aeac01 100644
--- a/Rs.SkyLine/Commom/Enums.cs
+++ b/Rs.SkyLine/Commom/Enums.cs
@@ -16,6 +16,10 @@ namespace Rs.MotionPlat.Commom
         /// </summary>
         Socket,
         /// <summary>
+        /// Socket第二行报警
+        /// </summary>
+        SocketFrom9ToSixteen,
+        /// <summary>
         /// 周转吸嘴
         /// </summary>
         TransitNozzle,
diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
index 1055877..0f9f9bd 100644
--- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
@@ -946,7 +946,14 @@ namespace Rs.MotionPlat.Flow
                                                 break;
                                             case ETipButton.Yes://移动到安全位
                                                 VacManager.TestTrayVacSuction(EVacOperator.Close,true, nozzle.NozzleIndex);
-                                                TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket);
+                                                if(nozzle.NozzleIndex<9)
+                                                {
+                                                    TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket);
+                                                }
+                                                else
+                                                {
+                                                    TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen);
+                                                }
                                                 break;
                                         }
                                     }
diff --git a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs
index da345db..5cfd300 100644
--- a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs
+++ b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs
@@ -61,6 +61,11 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
                                 targetPosX = SysConfigParam.GetValue<double>("TurnoverTakeX");
                                 targetPosY = SysConfigParam.GetValue<double>("PressY");
                                 break;
+                            case EExceptionSafePos.SocketFrom9ToSixteen:
+                                //targetPosX = SysConfigParam.GetValue<double>("TurnoverTakeX");
+                                targetPosX = TrayPointManager.GetExceptiontTrayPoint(2).X;
+                                targetPosY = SysConfigParam.GetValue<double>("PressY");
+                                break;
                             case EExceptionSafePos.TransitNozzle:
                                 targetPosX = GlobalVar.TransitNozzleExceptionSafePosX;
                                 targetPosY = GlobalVar.TransitNozzleExceptionSafePosY;