diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index c5e15ad..9c6b463 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -1761,6 +1761,32 @@ namespace Rs.MotionPlat.Flow }); StockManager.Instance.GetStock(ETrayType.Input).WaitFinished(); } + else + { + errCode = AxisControl.LoadX.MovePos(SysConfigParam.GetValue("LoadXStartPos"), GlobalVar.WholeSpeed); + if (errCode == ErrorCode.Ok || GlobalVar.VirtualAxis) + { + errCode = AxisControl.LoadY.MovePos(SysConfigParam.GetValue("LoadYStartPos"), GlobalVar.WholeSpeed); + if (errCode == ErrorCode.Ok || GlobalVar.VirtualAxis) + { + if (GlobalVar.VirtualAxis) + { + Thread.Sleep(GlobalVar.VirtualAxisMoveTime); + } + logInfo = GetClassName() + $"排料任务结束到安全位"; + MessageQueue.Instance.Insert(logInfo); + flowStep = EDischargeFlowStep.等待任务结束到安全位; + } + else + { + MsgBox.ShowAxisAlarmDialog(AxisControl.LoadY, errCode); + } + } + else + { + MsgBox.ShowAxisAlarmDialog(AxisControl.LoadX, errCode); + } + } flowStep = EDischargeFlowStep.等待任务结束到安全位; } }