diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
index 51537f8..b43519f 100644
--- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
@@ -1917,7 +1917,7 @@ namespace Rs.MotionPlat.Flow
                                                                     OnShowGrabResult?.Invoke(vrsigle, true);
                                                                     //复制二维码
                                                                     //LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, "");
-                                                                    Thread.Sleep(1000);
+                                                                    Thread.Sleep(500);
                                                                 }
                                                                 if(vrsigle != null)
                                                                 {
@@ -1928,12 +1928,16 @@ namespace Rs.MotionPlat.Flow
                                                             else
                                                             {
                                                                 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)
                                                                 {
                                                                     failNum = 1;
                                                                 }
-                                                                else if(box.Button== ETipButton.Skip)
+                                                                else if(box.Button== ETipButton.Cancel)
                                                                 {
                                                                     //OnShowGrabResult?.Invoke(vrsigle, true);
                                                                     //复制二维码
@@ -2019,7 +2023,7 @@ namespace Rs.MotionPlat.Flow
                                                                     OnShowGrabResult?.Invoke(vrsigle, true);
                                                                     //复制二维码
                                                                     //LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, "");
-                                                                    Thread.Sleep(1000);
+                                                                    Thread.Sleep(500);
                                                                 }
                                                                 if(vrsigle != null)
                                                                 {
@@ -2031,12 +2035,16 @@ namespace Rs.MotionPlat.Flow
                                                             {
                                                                 //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.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)
                                                                 {
                                                                     failNum = 1;
                                                                 }
-                                                                else if (box.Button == ETipButton.Skip)
+                                                                else if (box.Button == ETipButton.Cancel)
                                                                 {
                                                                     //OnShowGrabResult?.Invoke(vrsigle, true);
                                                                     //复制二维码
diff --git a/Rs.SkyLine/TestFrm.cs b/Rs.SkyLine/TestFrm.cs
index 5620c7b..310ac12 100644
--- a/Rs.SkyLine/TestFrm.cs
+++ b/Rs.SkyLine/TestFrm.cs
@@ -204,8 +204,12 @@ namespace Rs.MotionPlat
 
         private void button22_Click(object sender, EventArgs e)
         {
-            string alarminfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), "3");
-            MsgBox.ShowDialog(AlarmConstID.扫码失败, alarminfo, ETipButton.Retry| ETipButton.Cancel);
+            string alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.扫码失败), 3);
+            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)