1、排料放周转盘真空吸报警弹框按钮错误问题

Rs.SkyLine/Flow/AlarmConstID.cs

@@ -411,6 +411,11 @@ namespace Rs.MotionPlat.Flow
         /// </summary>
         public const int 周转盘测高有料报警 = 1094;
 
+        /// <summary>
+        /// 离子风扇报警
+        /// </summary>
+        public const int 离子风扇报警 = 1095;
+
         /// <summary>
         /// Empty1满料报警
         /// </summary>

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)

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