From f82161eea213b1abe4a811120abd9007f10a6d21 Mon Sep 17 00:00:00 2001
From: lhiven <2366881222@qq.com>
Date: Wed, 3 Jan 2024 21:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=93=E4=BB=8E=E5=91=A8?=
 =?UTF-8?q?=E8=BD=AC=E7=9B=98=E6=88=96=E6=B5=8B=E8=AF=95=E6=B2=BB=E5=85=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=99=E6=97=B6=E5=8F=96=E4=B8=8D=E8=B5=B7=E6=9D=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=88=E6=8A=8A=E6=B2=A1=E6=9C=89=E5=8F=96?=
 =?UTF-8?q?=E8=B5=B7=E6=9D=A5=E7=9A=84=E4=BA=A7=E5=93=81=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E7=A9=B4=E4=BD=8D=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
index 4c9fd79..57840ee 100644
--- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
@@ -228,9 +228,9 @@ 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.Wait();
+                                //undealTasks = LoadAndUnloadTask.Instance.GetTurnoverToTestTasks(ETaskDealStatus.Undeal);
+                                //TurnoverDumpFlow.Instance.Dump(ETrayType.Turnover, undealTasks.Select(t => t.FromIndex + 1).ToList());
+                                //TurnoverDumpFlow.Instance.Wait();
                                 Step = ETurnoverFlowStep.取料异常报警;
                             }
                         }
@@ -472,6 +472,12 @@ namespace Rs.MotionPlat.Flow
                     {
                         logInfo = GetClassName()+ $"周转吸头{hasProductNozzles.Select(n => n.NozzleIndex).ToJoinString()}真空检测OK";
                         MessageQueue.Instance.Insert(logInfo);
+                        undealTasks = LoadAndUnloadTask.Instance.GetTurnoverToTestTasks(ETaskDealStatus.Undeal);
+                        if(undealTasks.Count > 0 )
+                        {
+                            TurnoverDumpFlow.Instance.Dump(ETrayType.Turnover, undealTasks.Select(t => t.FromIndex + 1).ToList());
+                            TurnoverDumpFlow.Instance.Wait();
+                        }
                         Step = ETurnoverFlowStep.到测试放料位上方;
                     }
                     else
@@ -1219,9 +1225,9 @@ namespace Rs.MotionPlat.Flow
                             }
                             else
                             {
-                                undealTasks = LoadAndUnloadTask.Instance.GetTestToTurnoverTasks(ETaskDealStatus.Undeal);
-                                TurnoverDumpFlow.Instance.Dump(ETrayType.Test, undealTasks.Select(t => t.FromIndex + 1).ToList());
-                                TurnoverDumpFlow.Instance.Wait();
+                               // undealTasks = LoadAndUnloadTask.Instance.GetTestToTurnoverTasks(ETaskDealStatus.Undeal);
+                                //TurnoverDumpFlow.Instance.Dump(ETrayType.Test, undealTasks.Select(t => t.FromIndex + 1).ToList());
+                                //TurnoverDumpFlow.Instance.Wait();
                                 Step = ETurnoverFlowStep.测试治具取料失败报警;
                             }
                         }
@@ -1476,6 +1482,12 @@ namespace Rs.MotionPlat.Flow
                         hasProductNozzles = TransitNozzleManager.Instance.GetHasProductNozzles();
                         if (hasProductNozzles.Count > 0 || GlobalVar.RunSpace || GlobalVar.VirtualAxis)
                         {
+                            undealTasks = LoadAndUnloadTask.Instance.GetTestToTurnoverTasks(ETaskDealStatus.Undeal);
+                            if(undealTasks.Count > 0 )
+                            {
+                                TurnoverDumpFlow.Instance.Dump(ETrayType.Test, undealTasks.Select(t => t.FromIndex + 1).ToList());
+                                TurnoverDumpFlow.Instance.Wait();
+                            }
                             Step = ETurnoverFlowStep.到周转盘放料位上方;
                         }
                         else