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)