diff --git a/Rs.SkyLine/Flow/AlarmConstID.cs b/Rs.SkyLine/Flow/AlarmConstID.cs
index 806bde8..81eadb0 100644
--- a/Rs.SkyLine/Flow/AlarmConstID.cs
+++ b/Rs.SkyLine/Flow/AlarmConstID.cs
@@ -411,6 +411,11 @@ namespace Rs.MotionPlat.Flow
///
public const int 周转盘测高有料报警 = 1094;
+ ///
+ /// 离子风扇报警
+ ///
+ public const int 离子风扇报警 = 1095;
+
///
/// Empty1满料报警
///
diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
index 74c0923..7dcab03 100644
--- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
@@ -1821,7 +1821,7 @@ namespace Rs.MotionPlat.Flow
//msgBox = PromptMessageBox.ShowDialog(AlarmConstID.排料头放料到周转盘后周转盘真空吸报警, alarmInfo, ETipButton.Retry | ETipButton.Skip | ETipButton.Yes, buttons);// TestCenterMessageBox.WaitResult(AlarmConstID.TurnoverDumpFailAlarm);
alarmEntity = AlarmCollection.Get(AlarmConstID.排料头放料到周转盘后周转盘真空吸报警).Transform(curNozzle.NozzleIndex, curNozzle.ToIndex + 1);
MessageQueue.Instance.Warn(GetClassName() + alarmEntity.CN);
- ETipButton btnRet = AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry | ETipButton.Skip | ETipButton.Yes,null);
+ ETipButton btnRet = AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry | ETipButton.Skip | ETipButton.Yes, buttons);
//if (msgBox != null)
{
//switch (msgBox.Button)
diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs
index 0f0805e..ae35c17 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.28")]
+ [assembly: AssemblyVersion("3.20.24.29")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]