|
|
|
|
@ -180,7 +180,12 @@ namespace Rs.MotionPlat.Flow.NormalFlow
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.轴未到位异常);
|
|
|
|
|
if(alarmEntity!=null)
|
|
|
|
|
{
|
|
|
|
|
Msgbox.ShowDialog(alarmEntity, EButtonType.Ok, true);
|
|
|
|
|
step = ECalibrationFlowStep.到取印尼位上方;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
@ -346,9 +351,14 @@ namespace Rs.MotionPlat.Flow.NormalFlow
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
logInfo = $"{GetClassName()}轴不在目标位置";
|
|
|
|
|
MessageQueue.Instance.Warn(logInfo);
|
|
|
|
|
step = ECalibrationFlowStep.到拍照位;
|
|
|
|
|
AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.轴未到位异常);
|
|
|
|
|
if (alarmEntity != null)
|
|
|
|
|
{
|
|
|
|
|
Msgbox.ShowDialog(alarmEntity, EButtonType.Ok, true);
|
|
|
|
|
logInfo = $"{GetClassName()}轴不在目标位置";
|
|
|
|
|
MessageQueue.Instance.Warn(logInfo);
|
|
|
|
|
step = ECalibrationFlowStep.到拍照位;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
@ -516,9 +526,14 @@ namespace Rs.MotionPlat.Flow.NormalFlow
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
logInfo = $"{GetClassName()}轴不在目标位置";
|
|
|
|
|
MessageQueue.Instance.Warn(logInfo);
|
|
|
|
|
checkStep = ECalibrationCheckFlowStep.到拍照位;
|
|
|
|
|
AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.轴未到位异常);
|
|
|
|
|
if (alarmEntity != null)
|
|
|
|
|
{
|
|
|
|
|
Msgbox.ShowDialog(alarmEntity, EButtonType.Ok, true);
|
|
|
|
|
logInfo = $"{GetClassName()}轴不在目标位置";
|
|
|
|
|
MessageQueue.Instance.Warn(logInfo);
|
|
|
|
|
checkStep = ECalibrationCheckFlowStep.到拍照位;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|