From a56be284d428e116aef1b80f7af9bdc2e6a99a17 Mon Sep 17 00:00:00 2001 From: lhiven Date: Tue, 22 Apr 2025 08:05:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=9C=AA?= =?UTF-8?q?=E5=9C=A8=E4=B8=AD=E6=8E=A7=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 9 +++++---- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 47c8744..c71f3b0 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -2492,17 +2492,18 @@ namespace Rs.MotionPlat.Flow } else { - alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), vr.SlotIndex); + //alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), vr.SlotIndex); + alarmEntity = AlarmCollection.Get(AlarmConstID.扫码失败).Transform(vr.SlotIndex); Dictionary buttonTexts = new Dictionary() { { ETipButton.Retry,"重试|Retry"}, { ETipButton.Cancel,"自动移走|Auto remove"} }; - box = PromptMessageBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Cancel, buttonTexts); - if (box.Button == ETipButton.Retry) + ETipButton btn = AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry | ETipButton.Cancel, buttonTexts); + if (btn == ETipButton.Retry) { failNum = 1; } - else if (box.Button == ETipButton.Cancel) + else if (btn == ETipButton.Cancel) { //OnShowGrabResult?.Invoke(vrsigle, true); //复制二维码 diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 86f320a..5a1c4a1 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("20.25.09.01")] + [assembly: AssemblyVersion("20.25.10.01")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]