From e976f85dacfe523eba33d4e30e9bf5aa84ef0c36 Mon Sep 17 00:00:00 2001 From: lhiven <2366881222@qq.com> Date: Tue, 23 Jan 2024 15:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=BA=8C=E8=A1=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=92=8C=E7=AC=AC=E4=B8=80=E8=A1=8C=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 4 +++- Rs.SkyLine/TestFrm.cs | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 9c6b463..26c64d9 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -2029,7 +2029,9 @@ namespace Rs.MotionPlat.Flow } else { - box = MsgBox.ShowDialog(AlarmConstID.ScanBarCodeFailAlarm, $"{vr.SlotIndex}穴位扫码失败", ETipButton.Retry | ETipButton.Skip); + //box = MsgBox.ShowDialog(AlarmConstID.ScanBarCodeFailAlarm, $"{vr.SlotIndex}穴位扫码失败", ETipButton.Retry | ETipButton.Skip); + alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), vr.SlotIndex); + box = MsgBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Cancel); if (box.Button == ETipButton.Retry) { failNum = 1; diff --git a/Rs.SkyLine/TestFrm.cs b/Rs.SkyLine/TestFrm.cs index 6f99dcc..5620c7b 100644 --- a/Rs.SkyLine/TestFrm.cs +++ b/Rs.SkyLine/TestFrm.cs @@ -67,7 +67,8 @@ namespace Rs.MotionPlat buttonText.Add(ETipButton.Retry, "重试|Retry"); buttonText.Add(ETipButton.Skip, "跳过|Skip"); buttonText.Add(ETipButton.Yes, "移动到安全位|MoveToSafePos"); - MsgBox.ShowDialog(AlarmConstID.料仓tray盘取料报警, alarminfo, btnText, buttonText); + // MsgBox.ShowDialog(AlarmConstID.料仓tray盘取料报警, alarminfo, btnText, buttonText); + AlarmMsg.Show(AlarmConstID.料仓tray盘取料报警,AlarmCollection.Get(AlarmConstID.料仓tray盘取料报警).Transform("1","1"), btnText, buttonText); } private void button2_Click(object sender, EventArgs e)