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 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; } }