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