From b21fa721455ab23abc888cbcc4d30eca95533801 Mon Sep 17 00:00:00 2001 From: lhiven Date: Mon, 1 Jul 2024 11:39:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=A8=E8=BD=AC=E7=9B=98?= =?UTF-8?q?=E6=94=BE=E6=96=99=E7=9C=9F=E7=A9=BA=E6=8A=A5=E8=AD=A6=EF=BC=8C?= =?UTF-8?q?=E6=8E=92=E6=96=99=E6=9C=BA=E9=9C=80=E8=A6=81=E7=BB=99=E4=B8=AD?= =?UTF-8?q?=E6=8E=A7=E6=8A=A5=E8=AD=A6=E5=BC=B9=E7=AA=97=EF=BC=8C=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E7=BB=99=E7=9A=84=E6=8F=90=E7=A4=BA=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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() + $"选择了重拍";