周转吸嘴9-16取料失败，移动到安全位改到异常处理穴位点位

Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs

@@ -1401,7 +1401,14 @@ namespace Rs.MotionPlat.Flow
                                 case ETipButton.Yes://移动到安全位
                                     logInfo = GetClassName() + $"选择了移动到安全位按钮";
                                     MessageQueue.Instance.Insert(logInfo);
-                                    TransitModuleSafePosFlow.Instance.GoSafePostion( EExceptionSafePos.Socket);
+                                    if (testedSlots.Select(ts => (ts.Index >= 9 && ts.Index <= 16)).Count() > 0)
+                                    {
+                                        TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen);
+                                    }
+                                    else
+                                    {
+                                        TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket);
+                                    }
                                     break;
                                 default:
                                     break;
@@ -1991,18 +1998,21 @@ namespace Rs.MotionPlat.Flow
                                     LogHelper.Debug(GetClassName() + "检测到产品不在穴位中");
                                     bool exit = false;
                                     while (!exit)
+                                    {
+                                        try
                                         {
                                             //alarmInfo = $"周转盘{slot.Index}号穴位真空吸异常，请选择处理";
                                             alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.周转吸头放料到周转盘后周转盘真空吸报警), slot.Index);
+                                            LogHelper.Debug(alarmInfo);
                                             msgBox = MsgBox.ShowDialog(AlarmConstID.周转吸头放料到周转盘后周转盘真空吸报警, alarmInfo, MessageButtonManager.GetRetry_Skip_MoveToSafe_Button(), MessageButtonManager.GetRetry_Skip_MoveToSafe_ButtonText());
                                             switch (msgBox.Button)
                                             {
                                                 case ETipButton.Retry:
                                                     logInfo = GetClassName() + "选择了重试";
                                                     MessageQueue.Instance.Insert(logInfo);
-                                                vr = UpCameraScanBarCodeFlow.Instance.ScanSingle(slot.Index, true,true,false);
+                                                    vr = UpCameraScanBarCodeFlow.Instance.ScanSingle(slot.Index, true, true, false);
                                                     //vr = UpCameraScanBarCodeFlow.Instance.WaitSingle();
-                                                if(UpCameraScanBarCodeFlow.Instance.CheckResult(vr))
+                                                    if (UpCameraScanBarCodeFlow.Instance.CheckResult(vr))
                                                     {
                                                         slot.AddProduct(nozzle);
                                                         GlobalTray.TurnoverTray.ChangeStatus(slot.Index, ESlotStatus.Have);
@@ -2014,7 +2024,7 @@ namespace Rs.MotionPlat.Flow
                                                 case ETipButton.Skip:
                                                     logInfo = GetClassName() + "选择了跳过";
                                                     MessageQueue.Instance.Insert(logInfo);
-                                                if(GlobalVar.EnableExceptionHandlingNozzle)//启用大力吸嘴
+                                                    if (GlobalVar.EnableExceptionHandlingNozzle)//启用大力吸嘴
                                                     {
                                                         DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
                                                         WarningSuckerNgFlow.Instance.DealNgProduct(ETrayType.Turnover, slot.Index);
@@ -2043,6 +2053,11 @@ namespace Rs.MotionPlat.Flow
                                                     break;
                                             }
                                         }
+                                        catch (Exception ex)
+                                        {
+                                            Msg.ShowError(ex.Message);
+                                        }
+                                    }
                                 }
                                 else
                                 {

Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs

@@ -64,7 +64,7 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
                             case EExceptionSafePos.SocketFrom9ToSixteen:
                                 //targetPosX = SysConfigParam.GetValue<double>("TurnoverTakeX");
                                 targetPosX = TrayPointManager.GetExceptiontTrayPoint(2).X;
-                                targetPosY = SysConfigParam.GetValue<double>("PressDumpY");
+                                targetPosY = SysConfigParam.GetValue<double>("PressY");
                                 break;
                             case EExceptionSafePos.TransitNozzle:
                                 targetPosX = GlobalVar.TransitNozzleExceptionSafePosX;