From ec253fde47bb0e3c92e6bb3af24e17bc240f332c Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 3 Jan 2024 19:00:21 +0900 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=B5=8B=E8=AF=95=E6=B2=BB?= =?UTF-8?q?=E5=85=B7=E7=8A=B6=E6=80=81=E6=94=B9=E4=B8=BA=E6=94=BE=E6=96=99?= =?UTF-8?q?=E5=88=B0=E5=91=A8=E8=BD=AC=E7=9B=98=E5=AE=8C=E6=88=90=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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);