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

修改当周转盘单独扫码失败时提示跳过(关联硬件跳过按钮)改为自动移走(不再关联硬件按钮)

Browse Source
master
lhiven 1 year ago
parent 68dca5647a
commit c8df594626
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -1917,7 +1917,7 @@ namespace Rs.MotionPlat.Flow
OnShowGrabResult?.Invoke(vrsigle, true); OnShowGrabResult?.Invoke(vrsigle, true);
//复制二维码 //复制二维码
//LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, ""); //LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, "");
Thread.Sleep(1000); Thread.Sleep(500);
} }
if(vrsigle != null) if(vrsigle != null)
{ {
@ -1928,12 +1928,16 @@ namespace Rs.MotionPlat.Flow
else else
{ {
alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), vr.SlotIndex); alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), vr.SlotIndex);
box = MsgBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Skip); Dictionary<ETipButton, string> buttonTexts = new Dictionary<ETipButton, string>() {
{ ETipButton.Retry,"重试|Retry"},
{ ETipButton.Cancel,"自动移走|Auto remove"}
};
box = MsgBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Cancel, buttonTexts);
if (box.Button == ETipButton.Retry) if (box.Button == ETipButton.Retry)
{ {
failNum = 1; failNum = 1;
} }
else if(box.Button== ETipButton.Skip) else if(box.Button== ETipButton.Cancel)
{ {
//OnShowGrabResult?.Invoke(vrsigle, true); //OnShowGrabResult?.Invoke(vrsigle, true);
//复制二维码 //复制二维码
@ -2019,7 +2023,7 @@ namespace Rs.MotionPlat.Flow
OnShowGrabResult?.Invoke(vrsigle, true); OnShowGrabResult?.Invoke(vrsigle, true);
//复制二维码 //复制二维码
//LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, ""); //LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, "");
Thread.Sleep(1000); Thread.Sleep(500);
} }
if(vrsigle != null) if(vrsigle != null)
{ {
@ -2031,12 +2035,16 @@ namespace Rs.MotionPlat.Flow
{ {
//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); alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), vr.SlotIndex);
box = MsgBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Skip); Dictionary<ETipButton, string> buttonTexts = new Dictionary<ETipButton, string>() {
{ ETipButton.Retry,"重试|Retry"},
{ ETipButton.Cancel,"自动移走|Auto remove"}
};
box = MsgBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.Cancel, buttonTexts);
if (box.Button == ETipButton.Retry) if (box.Button == ETipButton.Retry)
{ {
failNum = 1; failNum = 1;
} }
else if (box.Button == ETipButton.Skip) else if (box.Button == ETipButton.Cancel)
{ {
//OnShowGrabResult?.Invoke(vrsigle, true); //OnShowGrabResult?.Invoke(vrsigle, true);
//复制二维码 //复制二维码

8
Rs.SkyLine/TestFrm.cs
Unescape Escape View File

@ -204,8 +204,12 @@ namespace Rs.MotionPlat
private void button22_Click(object sender, EventArgs e) private void button22_Click(object sender, EventArgs e)
{ {
string alarminfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), "3"); string alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), 3);
MsgBox.ShowDialog(AlarmConstID.扫码失败, alarminfo, ETipButton.Retry| ETipButton.Cancel); Dictionary<ETipButton, string> buttonTexts = new Dictionary<ETipButton, string>() {
{ ETipButton.Retry,"重试|Retry"},
{ ETipButton.No,"自动移走|Auto remove"}
};
MsgBox.ShowDialog(AlarmConstID.扫码失败, alarmInfo, ETipButton.Retry | ETipButton.No, buttonTexts);
} }
private void button23_Click(object sender, EventArgs e) private void button23_Click(object sender, EventArgs e)

Write Preview
Loading…
Cancel
Save