From 4ec57bc7dcd10cde97c15f3703ad9eabd5d42804 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Sun, 31 Dec 2023 14:19:50 +0900
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=96=99=E5=A4=B1=E8=B4=A5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E5=8F=96=E6=96=99=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E5=90=B8=E5=98=B4=E4=BB=8E=E6=96=B0=E6=94=BE=E5=88=B0=E7=9B=98?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs  | 6 ++++++
 Rs.SkyLine/Flow/SubFlow/TurnoverDumpFlow.cs | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
index cf747bc..1397e03 100644
--- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
@@ -228,6 +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();
                                 Step = ETurnoverFlowStep.取料异常报警;
                             }
                         }
@@ -1216,6 +1219,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();
                                 Step = ETurnoverFlowStep.测试治具取料失败报警;
                             }
                         }
diff --git a/Rs.SkyLine/Flow/SubFlow/TurnoverDumpFlow.cs b/Rs.SkyLine/Flow/SubFlow/TurnoverDumpFlow.cs
index e8fbf26..6123ac7 100644
--- a/Rs.SkyLine/Flow/SubFlow/TurnoverDumpFlow.cs
+++ b/Rs.SkyLine/Flow/SubFlow/TurnoverDumpFlow.cs
@@ -40,10 +40,11 @@ namespace Rs.MotionPlat.Flow.SubFlow
         ErrorCode errCode = ErrorCode.Ok;
         string logInfo = string.Empty;
         ManualResetEvent dumpFinished = new ManualResetEvent(true);
-        bool finished = false;
+        bool finished = true;
 
         public bool Dump(ETrayType trayType, List<int> transitNozzleList)
         {
+            step = ETurnoverDumpFlowStep.到放料位下方;
             if (finished)
             {
                 dumpFinished.Reset();
@@ -99,7 +100,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
                             {
                                 logInfo = GetClassName() + $"放料完成抬起";
                                 MessageQueue.Instance.Insert(logInfo);
-                                step = ETurnoverDumpFlowStep.等待到放料位下方;
+                                step = ETurnoverDumpFlowStep.等待放料完成抬起;
                             }
                             else
                             {
@@ -112,9 +113,10 @@ namespace Rs.MotionPlat.Flow.SubFlow
                                 if (Ops.IsArrived(AxisControl.TurnoverZ))
                                 {
                                     finished = true;
-                                    dumpFinished.Set();
+                                    
                                     logInfo = GetClassName() + $"放料完成已抬起";
                                     MessageQueue.Instance.Insert(logInfo);
+                                    dumpFinished.Set();
                                     break;
                                 }
                             }