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")]