Commit ac8b4725 张东亮

修复2号车刚关门,7号车去电梯口占用电梯,导致楼下无法使用电梯

1 个父辈 fb5e3e86
...@@ -225,26 +225,16 @@ namespace DeviceLibrary.bean.job ...@@ -225,26 +225,16 @@ namespace DeviceLibrary.bean.job
//上报位置 //上报位置
System.Threading.Thread.Sleep(1000); System.Threading.Thread.Sleep(1000);
} }
else if (JobRunStep.IsTimeOut(20) && !lift.LiftContext.CheckIfRequestOk(JobParam.SrcNode.Name, JobParam.GetMissionInfo()))
{
JobRunStep.ToNextStep(RunStep.SD_LiftToLine_12_WaitDoorOpen);
//请求电梯
lift.LiftContext.Request(JobParam.GetMissionInfo(), agv, true);
}
} }
else if (JobRunStep.IsStep(RunStep.SD_LiftToLine_13_CheckLiftStatus)) else if (JobRunStep.IsStep(RunStep.SD_LiftToLine_13_CheckLiftStatus))
{ {
if (lift.LiftContext.IsDoorOpen(JobParam.SrcNode.Name, JobParam.GetMissionInfo().destinationFloor))
{
if (lift.LiftContext.HasShelfNeedLeave(JobParam.SrcNode.Name, agv.Client, out liftStatus)) if (lift.LiftContext.HasShelfNeedLeave(JobParam.SrcNode.Name, agv.Client, out liftStatus))
{ {
JobRunStep.ToNextStep(RunStep.SD_LiftToLine_14_01_ToTemp1); JobRunStep.ToNextStep(RunStep.SD_LiftToLine_14_01_ToTemp1);
runInfo = $"{JobParam.SrcNode.AliceName}内有料车,去临时点1放料点"; runInfo = $"{JobParam.SrcNode.AliceName}内有料车,去临时点1放料点";
AllocateTask(agv, $"{JobParam.SrcNode.Name}_{SettingString.Temp1}_{SettingString.TakeShelfOff}"); AllocateTask(agv, $"{JobParam.SrcNode.Name}_{SettingString.Temp1}_{SettingString.TakeShelfOff}");
//service.model.MissionInfo missionInfo = manager.MissionManager.GetMission(liftStatus.missionId);
//if (missionInfo != null)
//{
// //任务状态变更
// MissionManager.SetMissionState(missionInfo.missionId, service.model.MissionState.电梯到达, out string msg);
//}
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
} }
else else
...@@ -255,8 +245,13 @@ namespace DeviceLibrary.bean.job ...@@ -255,8 +245,13 @@ namespace DeviceLibrary.bean.job
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
AllocateTask(agv, $"{JobParam.SrcNode.Name}_{SettingString.TakeShelfOff}"); AllocateTask(agv, $"{JobParam.SrcNode.Name}_{SettingString.TakeShelfOff}");
} }
}
else if (JobRunStep.IsTimeOut(20) && !lift.LiftContext.CheckIfRequestOk(JobParam.SrcNode.Name, JobParam.GetMissionInfo()))
{
JobRunStep.ToNextStep(RunStep.SD_LiftToLine_12_WaitDoorOpen);
//请求电梯
lift.LiftContext.Request(JobParam.GetMissionInfo(), agv, true);
}
} }
#region 电梯内无料车 #region 电梯内无料车
else if (JobRunStep.IsStep(RunStep.SD_LiftToLine_14_01_EnterLift)) else if (JobRunStep.IsStep(RunStep.SD_LiftToLine_14_01_EnterLift))
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!