diff --git a/Rs.SkyLine/Commom/AlarmMessageBox.cs b/Rs.SkyLine/Commom/AlarmMessageBox.cs index 4c373d9..326cc67 100644 --- a/Rs.SkyLine/Commom/AlarmMessageBox.cs +++ b/Rs.SkyLine/Commom/AlarmMessageBox.cs @@ -67,7 +67,7 @@ namespace Rs.MotionPlat.Commom msgBoxs.Remove(alarmInfo.NO); } ETipButton button = closeInfoDic[alarmInfo.NO].Button; - + LightManger.Instance.SetStatus(ELightStatus.Green); closeInfoDic.Remove(alarmInfo.NO); return button; } diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 5ab779f..41db36b 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -1374,14 +1374,23 @@ namespace Rs.MotionPlat.Flow } break; case ETurnoverFlowStep.通知中控开始测试: - MachineManage.Instance.TestStatus = ETestStatus.Testing; - loadOk = true; - HashSet needTestSlot = TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Select(s => s.Index-1).ToHashSet(); - MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.Ready, ReadySites = needTestSlot }); - logInfo = GetClassName() + $"通知中控测试位就绪,可以开始测试{needTestSlot.ToJoinString()}"; - MessageQueue.Instance.Insert(logInfo); - //Thread.Sleep(1000 * 30); - Step = ETurnoverFlowStep.等待测试完成; + HashSet needTestSlot = TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Select(s => s.Index - 1).ToHashSet(); + if (needTestSlot!=null&& needTestSlot.Count>0) + { + MachineManage.Instance.TestStatus = ETestStatus.Testing; + loadOk = true; + MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.Ready, ReadySites = needTestSlot }); + logInfo = GetClassName() + $"通知中控测试位就绪,可以开始测试{needTestSlot.ToJoinString()}"; + MessageQueue.Instance.Insert(logInfo); + //Thread.Sleep(1000 * 30); + Step = ETurnoverFlowStep.等待测试完成; + } + else + { + logInfo = GetClassName() + $"检测到没有需要测试的产品,流程结束"; + MessageQueue.Instance.Insert(logInfo); + Step = ETurnoverFlowStep.等待任务; + } break; /*---------------------------------------------准备下料---------------------------------------------------------------------------------*/ case ETurnoverFlowStep.等待测试完成: diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index c6ba6eb..0ecf7db 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //通过使用 "*",如下所示: - [assembly: AssemblyVersion("2.20.24.30")] + [assembly: AssemblyVersion("3.20.24.02")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]