优化周转模组在周转盘取料失败后提示错误和破真空时吸嘴错我

Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs

@@ -249,7 +249,7 @@ namespace Rs.MotionPlat.Flow
                             else
                             {
                                 undealTasks = LoadAndUnloadTask.Instance.GetTurnoverToTestTasks(ETaskDealStatus.Undeal);
-                                TurnoverDumpFlow.Instance.Dump(ETrayType.Turnover, undealTasks.Select(t => t.FromIndex + 1).ToList());
+                                TurnoverDumpFlow.Instance.Dump(ETrayType.Turnover, undealTasks.Select(t => ((t.FromIndex + 1) > 8 ? (t.FromIndex + 1) - 8 : (t.FromIndex + 1))).ToList());
                                 TurnoverDumpFlow.Instance.Wait();
                                 Step = ETurnoverFlowStep.取料异常报警;
                             }
@@ -265,7 +265,7 @@ namespace Rs.MotionPlat.Flow
                         while (!exit)
                         {
                             //alarmInfo = GetClassName() + $"周转盘{string.Join(",", untestSlots.Select(s => s.Index))}号穴位产品未取出，请处理";
-                            alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.周转吸头在周转盘取料失败报警), untestSlots.Select(s => s.Index).ToJoinString(), untestSlots.Select(s => s.Index).ToJoinString());
+                            alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.周转吸头在周转盘取料失败报警), untestSlots.Select(s => (s.Index>8?s.Index-8:s.Index)).ToJoinString(), untestSlots.Select(s => s.Index).ToJoinString());
                             //TestCenterMessageBox.Show(AlarmConstID.TurnoverTakeFailAlarm, alarmInfo, MessageButtonManager.GetRetry_Skip_MoveToSafe_Button(),
                                 //MessageButtonManager.GetRetry_Skip_MoveToSafe_ButtonText());
                             msgBox = MsgBox.ShowDialog(AlarmConstID.周转吸头在周转盘取料失败报警, alarmInfo, MessageButtonManager.GetRetry_Skip_MoveToSafe_Button(),MessageButtonManager.GetRetry_Skip_MoveToSafe_ButtonText());// TestCenterMessageBox.WaitResult(AlarmConstID.TurnoverTakeFailAlarm);
@@ -287,7 +287,7 @@ namespace Rs.MotionPlat.Flow
                                         {
                                             WarningSuckerNgFlow.Instance.DealNgProduct(ETrayType.Turnover, slot.Index);
                                             slot.ClearProduct();
-                                            VacManager.TurnoverTrayVacSuction(EVacOperator.Close,true, slot.Index);
+                                            VacManager.TurnoverTrayVacSuction(EVacOperator.Close, true, slot.Index > 8 ? slot.Index - 8 : slot.Index);
                                             GlobalTray.TurnoverTray.ChangeStatus(slot.Index, ESlotStatus.NotHave);
                                         }
                                         exit = true;
@@ -490,7 +490,7 @@ namespace Rs.MotionPlat.Flow
                         undealTasks = LoadAndUnloadTask.Instance.GetTurnoverToTestTasks(ETaskDealStatus.Undeal);
                         if(undealTasks.Count > 0 )
                         {
-                            TurnoverDumpFlow.Instance.Dump(ETrayType.Turnover, undealTasks.Select(t => t.FromIndex + 1).ToList());
+                            TurnoverDumpFlow.Instance.Dump(ETrayType.Turnover, undealTasks.Select(t => ((t.FromIndex + 1) > 8 ? (t.FromIndex + 1 - 8) : (t.FromIndex + 1))).ToList());
                             TurnoverDumpFlow.Instance.Wait();
                         }
                         Step = ETurnoverFlowStep.到测试放料位上方;

Rs.SkyLine/Flow/TestCenter.cs

@@ -526,15 +526,20 @@ namespace Rs.MotionPlat.Flow
 
         public int Send(string content,Encoding encode,bool writeLog=true)
         {
-            while (true)
+           // while (true)
             {
                 int len = client.Send(content, encode);
-                if (len > 0 && writeLog)
+
+                if (len > 0)
                 {
-                    LogHelper.Debug(" <<< " + content);
+                    if(writeLog)
+                    {
+                        LogHelper.Debug(" <<< " + content);
+                    }
                     return len;
                 }
-                Thread.Sleep(1000);
+                return len;
+                //Thread.Sleep(1000);
             }
             
         }