From 187230b3f21fb27c991b2f6e6e0d74145adc90a1 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Sat, 23 Mar 2024 09:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=A7=E5=93=81=E6=94=BE=E5=88=B0=E5=91=A8?= =?UTF-8?q?=E8=BD=AC=E7=9B=98=EF=BC=8C=E5=91=A8=E8=BD=AC=E5=90=B8=E5=98=B4?= =?UTF-8?q?=E5=8F=96=E6=96=99=E5=A4=B1=E8=B4=A5=E8=B7=B3=E8=BF=87=E8=AF=A5?= =?UTF-8?q?=E4=BA=A7=E5=93=81=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95=E6=97=B6=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8D=A1=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/AlarmMessageBox.cs | 2 +- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 25 +++++++++++++++------- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) 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")]