|
|
|
@ -4,6 +4,7 @@ using Rs.Motion;
|
|
|
|
using Rs.MotionPlat.Commom;
|
|
|
|
using Rs.MotionPlat.Commom;
|
|
|
|
using Rs.MotionPlat.Entitys;
|
|
|
|
using Rs.MotionPlat.Entitys;
|
|
|
|
using Rs.MotionPlat.Flow.Common;
|
|
|
|
using Rs.MotionPlat.Flow.Common;
|
|
|
|
|
|
|
|
using Rs.MotionPlat.Flow.NormalFlow;
|
|
|
|
using System;
|
|
|
|
using System;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Linq;
|
|
|
|
using System.Linq;
|
|
|
|
@ -177,7 +178,14 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
moveXStep = EDischargeModuleGoSafePosFlowStep.到安全位;
|
|
|
|
AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.轴未到位异常);
|
|
|
|
|
|
|
|
if (alarmEntity != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Msgbox.ShowDialog(alarmEntity, EButtonType.Ok, true);
|
|
|
|
|
|
|
|
logInfo = $"{GetClassName()}轴不在目标位置";
|
|
|
|
|
|
|
|
MessageQueue.Instance.Warn(logInfo);
|
|
|
|
|
|
|
|
moveXStep = EDischargeModuleGoSafePosFlowStep.到安全位;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
@ -230,7 +238,14 @@ namespace Rs.MotionPlat.Flow.SafePosFlow
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
moveY1Step = EDischargeModuleGoSafePosFlowStep.到安全位;
|
|
|
|
AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.轴未到位异常);
|
|
|
|
|
|
|
|
if (alarmEntity != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Msgbox.ShowDialog(alarmEntity, EButtonType.Ok, true);
|
|
|
|
|
|
|
|
logInfo = $"{GetClassName()}轴不在目标位置";
|
|
|
|
|
|
|
|
MessageQueue.Instance.Warn(logInfo);
|
|
|
|
|
|
|
|
moveY1Step = EDischargeModuleGoSafePosFlowStep.到安全位;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|