From bed418e1048a82b1cfd02a81509650cbadc75d5b Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 16 Apr 2025 11:54:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8E=92=E6=96=99?= =?UTF-8?q?=E5=A4=B4=E5=9C=A8=E5=91=A8=E8=BD=AC=E7=9B=98=E5=8F=96=E6=96=99?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=B0=E5=AE=89=E5=85=A8=E4=BD=8D=E5=90=8E=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?= =?UTF-8?q?=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/Flow/NormalFlow/DischargeFlow.cs | 4 +++- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 894649d..47c8744 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -769,6 +769,7 @@ namespace Rs.MotionPlat.Flow //StockManager.Instance.Wait(EStockType.Input); logInfo = GetClassName() + $"料仓已退回到安全位"; MessageQueue.Instance.Insert(logInfo); + alarmEntity = AlarmCollection.Get(AlarmConstID.料仓tray盘取料报警).Transform(curNozzle.NozzleIndex, (curNozzle.FromIndex + 1)); } else if (curTask.FromType == TurnoverType.Turnover) { @@ -777,9 +778,10 @@ namespace Rs.MotionPlat.Flow DischargeModuleGoSafePosFlow.Instance.GoSafePostion(); logInfo = GetClassName() + $"排料头已回到安全位"; MessageQueue.Instance.Insert(logInfo); + alarmEntity = AlarmCollection.Get(AlarmConstID.排料头在周转盘取料失败报警).Transform(curNozzle.NozzleIndex, (curNozzle.FromIndex + 1)); } //alarmInfo = $"排料吸嘴{curNozzle.NozzleIndex}号取{curNozzle.FromIndex+1}号穴位产品失败，请处理"; - alarmEntity = AlarmCollection.Get(AlarmConstID.料仓tray盘取料报警).Transform(curNozzle.NozzleIndex, (curNozzle.FromIndex + 1)); + flowStep = EDischargeFlowStep.取料失败报警; Start(); break; diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 7039b38..86f320a 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("20.25.08.04")] + [assembly: AssemblyVersion("20.25.09.01")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]