From f50dd18f9f4717a3e9de1a14633bbd71cbe26b01 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Tue, 6 Aug 2024 10:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=AE=9A=E6=B5=81=E7=A8=8B=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89=E6=8B=8D=E7=85=A7=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=80=E5=87=BA=E6=A0=87=E5=AE=9A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Flow/NormalFlow/CalibrationFlow.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Rs.DeweyTester/Flow/NormalFlow/CalibrationFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/CalibrationFlow.cs
index 3fea813..e607504 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/CalibrationFlow.cs
+++ b/Rs.DeweyTester/Flow/NormalFlow/CalibrationFlow.cs
@@ -364,8 +364,12 @@ namespace Rs.MotionPlat.Flow.NormalFlow
                             else
                             {
                                 AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.标定失败);
-                                Msgbox.ShowDialog(alarmEntity,EButtonType.Retry,true);
-                                //Msgbox.ShowDialog(EButtonType.Retry, "Calib fail,please select retry");
+                                EButtonType btnSelect = Msgbox.ShowDialog(alarmEntity,EButtonType.Retry | EButtonType.Cancel,true);
+                                if(btnSelect== EButtonType.Cancel)
+                                {
+                                    run = false;
+                                    step = ECalibrationFlowStep.到取印尼位上方;
+                                }
                             }
                             break;
                         case ECalibrationFlowStep.等待视觉处理结果: