From 020cc6104992871f26832c967420311567170b62 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Mon, 22 Jan 2024 18:40:26 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=A8=E8=BD=AC=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E5=9C=A8=E5=91=A8=E8=BD=AC=E7=9B=98=E5=8F=96=E6=96=99?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=92=8C=E7=A0=B4=E7=9C=9F=E7=A9=BA=E6=97=B6=E5=90=B8=E5=98=B4?=
 =?UTF-8?q?=E9=94=99=E6=88=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs |  8 ++++----
 Rs.SkyLine/Flow/TestCenter.cs              | 13 +++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
index 34a89fc..1055877 100644
--- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
+++ b/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.到测试放料位上方;
diff --git a/Rs.SkyLine/Flow/TestCenter.cs b/Rs.SkyLine/Flow/TestCenter.cs
index ea18eaf..248aaf5 100644
--- a/Rs.SkyLine/Flow/TestCenter.cs
+++ b/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);
             }
             
         }