From 316b933a7d991d5487b8c2fcdde639c80c200ea0 Mon Sep 17 00:00:00 2001 From: lhiven Date: Fri, 13 Dec 2024 10:56:46 +0800 Subject: [PATCH] =?UTF-8?q?0=E3=80=81=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=9A3?= =?UTF-8?q?.20.24.59=201=E3=80=81=E7=AD=89=E5=BE=85=E6=96=99=E7=9B=98?= =?UTF-8?q?=E5=88=B0=E4=BD=8D=E5=85=89=E7=94=B5=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=8A=A5=E8=AD=A6=E6=9C=BA=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=84=9F=E5=BA=94=E4=B8=8D=E5=88=B0=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E5=88=99=E6=8A=A5=E8=AD=A6=202=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BD=93=E5=90=AF=E5=8A=A8=E6=A3=80=E6=B5=8B=E5=88=B0?= =?UTF-8?q?=E7=A9=B4=E4=BD=8D=E6=97=A0=E6=96=99=E6=97=B6=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E5=86=85=E5=AD=98=E4=B8=AD=E7=9A=84=E6=9C=89=E6=96=99?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/LoadAndUnloadTask.cs | 2 +- Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs | 44 +++++++++++++++++++-- Rs.SkyLine/Flow/WorkEnvironment.cs | 2 + Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs index db67477..bad3287 100644 --- a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs +++ b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs @@ -374,7 +374,7 @@ namespace Rs.MotionPlat.Flow /// public TurnoverInfo GetTestUnloadTask(int fromIndex) { - return testUnloadTaskList.Where(t => t.FromIndex == fromIndex-1).First(); + return testUnloadTaskList.Where(t => t.FromIndex == fromIndex-1).FirstOrDefault(); } /// diff --git a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs index 3486b5a..6ed50da 100644 --- a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs @@ -529,14 +529,52 @@ namespace Rs.AutoDischarge.V3.Flow public void LoadedOK() { actionFinishedEvent.WaitOne(); + Stopwatch tm = new Stopwatch(); + tm.Start(); while( true ) { - if (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测") || GlobalVar.VirtualAxis) + if(tm.ElapsedMilliseconds<5000) { - break; + if (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测") || GlobalVar.VirtualAxis) + { + break; + } + else + { + Thread.Sleep(100); + } } else { - Thread.Sleep(100); + tm.Stop(); + switch (m_stockType) + { + case ETrayType.Empty1: + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测1号报警).Transform(m_stockType.ToString()); + break; + case ETrayType.Input: + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测2号报警).Transform(m_stockType.ToString()); + break; + case ETrayType.Ok: + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测3号报警).Transform(m_stockType.ToString()); + break; + case ETrayType.Ng: + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测4号报警).Transform(m_stockType.ToString()); + break; + case ETrayType.Multi: + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测5号报警).Transform(m_stockType.ToString()); + break; + case ETrayType.Empty2: + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测6号报警).Transform(m_stockType.ToString()); + break; + default: + break; + } + if (alarmEntity != null) + { + MessageQueue.Instance.Warn(GetClassName() + alarmEntity.CN); + AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry, null); + tm.Restart(); + } } } } diff --git a/Rs.SkyLine/Flow/WorkEnvironment.cs b/Rs.SkyLine/Flow/WorkEnvironment.cs index b38de1c..11232bc 100644 --- a/Rs.SkyLine/Flow/WorkEnvironment.cs +++ b/Rs.SkyLine/Flow/WorkEnvironment.cs @@ -2,6 +2,7 @@ using Rs.AutoDischarge.V3.Flow; using Rs.Framework; using Rs.MotionPlat.Commom; +using Rs.MotionPlat.Entitys.Trays; using Rs.MotionPlat.Flow.Camera; using Rs.MotionPlat.Flow.SafePosFlow; using Rs.MotionPlat.Flow.SubFlow; @@ -392,6 +393,7 @@ namespace Rs.MotionPlat.Flow MessageQueue.Instance.Insert($"测试{i}号穴位无料"); Ops.Off($"测试{i}号穴位真空吸"); LogHelper.Debug($"关闭测试{i}号穴位真空吸"); + TestTrayManager.Instance.Slot(i).ResetStatus(); } } if (dischargeNozzles.Count > 0 || turnoverNozzles.Count > 0 || turnoverTraySlots.Count > 0 || socketSlots.Count > 0) diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 90e4c82..c1a2071 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("3.20.24.57")] + [assembly: AssemblyVersion("3.20.24.59")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]