diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index a6ac936..4c9fd79 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -1277,9 +1277,7 @@ namespace Rs.MotionPlat.Flow testedSlots = testedSlots = TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have); if (testedSlots == null || testedSlots.Count == 0) { - MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.NotReady, ReadySites = null }); - logInfo = GetClassName() + "通知中控产品全部已从治具中取出,状态变成NotReady"; - MessageQueue.Instance.Insert(logInfo); + exit = true; Step = ETurnoverFlowStep.上报中控任务完成; } @@ -1462,9 +1460,7 @@ namespace Rs.MotionPlat.Flow } if (TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Count == 0) { - MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.NotReady, ReadySites = null }); - logInfo = GetClassName() + "通知中控产品全部已从治具中取出,状态变成NotReady"; - MessageQueue.Instance.Insert(logInfo); + hasProductNozzles = TransitNozzleManager.Instance.GetHasProductNozzles(); if (hasProductNozzles.Count > 0 || GlobalVar.RunSpace || GlobalVar.VirtualAxis) { @@ -1996,6 +1992,9 @@ namespace Rs.MotionPlat.Flow } break; case ETurnoverFlowStep.上报中控任务完成: + MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.NotReady, ReadySites = null }); + logInfo = GetClassName() + "通知中控产品全部已从治具中取出,状态变成NotReady"; + MessageQueue.Instance.Insert(logInfo); unloadOk = true; TestCenter.Instance.LoadTestUnLoadResult(); LoadAndUnloadTask.Instance.Clear(1);