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