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 /// Socket, /// + /// Socket第二行报警 + /// + SocketFrom9ToSixteen, + /// /// 周转吸嘴 /// 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("TurnoverTakeX"); targetPosY = SysConfigParam.GetValue("PressY"); break; + case EExceptionSafePos.SocketFrom9ToSixteen: + //targetPosX = SysConfigParam.GetValue("TurnoverTakeX"); + targetPosX = TrayPointManager.GetExceptiontTrayPoint(2).X; + targetPosY = SysConfigParam.GetValue("PressY"); + break; case EExceptionSafePos.TransitNozzle: targetPosX = GlobalVar.TransitNozzleExceptionSafePosX; targetPosY = GlobalVar.TransitNozzleExceptionSafePosY;