diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index af1d12a..8b3633f 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -26,6 +26,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using static Rs.MotionPlat.Commom.SchedulingMessageBox; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window; namespace Rs.MotionPlat.Flow { @@ -1814,13 +1815,17 @@ namespace Rs.MotionPlat.Flow while (!exit) { //alarmInfo = $"周转盘{curNozzle.ToIndex + 1}号穴位真空吸异常"; - alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.排料头放料到周转盘后周转盘真空吸报警), curNozzle.NozzleIndex, curNozzle.ToIndex + 1); - MessageQueue.Instance.Warn(GetClassName() + alarmInfo); + //alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.排料头放料到周转盘后周转盘真空吸报警), curNozzle.NozzleIndex, curNozzle.ToIndex + 1); + //MessageQueue.Instance.Warn(GetClassName() + alarmInfo); //TestCenterMessageBox.Show(AlarmConstID.TurnoverDumpFailAlarm, alarmInfo, ETipButton.Retry | ETipButton.Skip | ETipButton.Yes, buttons); - msgBox = PromptMessageBox.ShowDialog(AlarmConstID.排料头放料到周转盘后周转盘真空吸报警, alarmInfo, ETipButton.Retry | ETipButton.Skip | ETipButton.Yes, buttons);// TestCenterMessageBox.WaitResult(AlarmConstID.TurnoverDumpFailAlarm); - if (msgBox != null) + //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); + //if (msgBox != null) { - switch (msgBox.Button) + //switch (msgBox.Button) + switch (btnRet) { case ETipButton.Retry://重拍 logInfo = GetClassName() + $"选择了重拍";