lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、优化扫码失败报警信息未在中控记录的问题。

Browse Source
develop
lhiven 2 months ago
parent bed418e104
commit a56be284d4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

9
Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -2492,17 +2492,18 @@ namespace Rs.MotionPlat.Flow
} }
else 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<ETipButton, string> buttonTexts = new Dictionary<ETipButton, string>() { Dictionary<ETipButton, string> buttonTexts = new Dictionary<ETipButton, string>() {
{ ETipButton.Retry,"重试|Retry"}, { ETipButton.Retry,"重试|Retry"},
{ ETipButton.Cancel,"自动移走|Auto remove"} { ETipButton.Cancel,"自动移走|Auto remove"}
}; };
box = PromptMessageBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Cancel, buttonTexts); ETipButton btn = AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry | ETipButton.Cancel, buttonTexts);
if (box.Button == ETipButton.Retry) if (btn == ETipButton.Retry)
{ {
failNum = 1; failNum = 1;
} }
else if (box.Button == ETipButton.Cancel) else if (btn == ETipButton.Cancel)
{ {
//OnShowGrabResult?.Invoke(vrsigle, true); //OnShowGrabResult?.Invoke(vrsigle, true);
//复制二维码 //复制二维码

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -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: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]

Write Preview
Loading…
Cancel
Save