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.等待视觉处理结果: