Commit 6eb00a51 张东亮

移远成品到一楼后在待机点状态异常修复

1 个父辈 07c67e06
...@@ -131,6 +131,7 @@ namespace DeviceLibrary.bean.job ...@@ -131,6 +131,7 @@ namespace DeviceLibrary.bean.job
SetLiftOccupied(JobParam.SrcNode.Name, agv); SetLiftOccupied(JobParam.SrcNode.Name, agv);
ToPutShelfOn(agv, $"{JobParam.SrcNode.Name}"); ToPutShelfOn(agv, $"{JobParam.SrcNode.Name}");
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
MissionManager.SetMissionState(JobParam.GetMissionInfo().missionId, service.model.MissionState.电梯到达, out string msg);
} }
else if (JobRunStep.IsTimeOut(20) && !LiftContext.CheckIfRequestOk(JobParam.SrcNode.Name, JobParam.GetMissionInfo())) else if (JobRunStep.IsTimeOut(20) && !LiftContext.CheckIfRequestOk(JobParam.SrcNode.Name, JobParam.GetMissionInfo()))
{ {
...@@ -163,6 +164,7 @@ namespace DeviceLibrary.bean.job ...@@ -163,6 +164,7 @@ namespace DeviceLibrary.bean.job
runInfo = $"在{JobParam.SrcNode.AliceName}取料车完成,准备离开"; runInfo = $"在{JobParam.SrcNode.AliceName}取料车完成,准备离开";
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
LeaveLift(agv, JobParam.SrcNode.Name); LeaveLift(agv, JobParam.SrcNode.Name);
} }
} }
else if (JobRunStep.IsStep(RunStep.S1F_LiftC1ToLiftD2_05_LeaveLift)) else if (JobRunStep.IsStep(RunStep.S1F_LiftC1ToLiftD2_05_LeaveLift))
...@@ -175,6 +177,7 @@ namespace DeviceLibrary.bean.job ...@@ -175,6 +177,7 @@ namespace DeviceLibrary.bean.job
runInfo = $"离开{JobParam.SrcNode.AliceName},关闭电梯门:{rtn}"; runInfo = $"离开{JobParam.SrcNode.AliceName},关闭电梯门:{rtn}";
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
ClearLiftNodeOccupied(agv); ClearLiftNodeOccupied(agv);
MissionManager.SetMissionState(JobParam.GetMissionInfo().missionId, service.model.MissionState.离开电梯, out string msg);
} }
} }
else if (JobRunStep.IsStep(RunStep.S1F_LiftC1ToLiftD2_06_CloseLiftDoor)) else if (JobRunStep.IsStep(RunStep.S1F_LiftC1ToLiftD2_06_CloseLiftDoor))
......
...@@ -402,6 +402,7 @@ namespace DeviceLibrary.lift ...@@ -402,6 +402,7 @@ namespace DeviceLibrary.lift
if (liftStatus.destinationClient.Equals(client)) if (liftStatus.destinationClient.Equals(client))
{ {
liftStatus.missionId = manager.MissionManager.GetMissionIdByShelfInLift(liftId); liftStatus.missionId = manager.MissionManager.GetMissionIdByShelfInLift(liftId);
liftStatus.missionId = manager.MissionManager.GetMissionIdByShelfInLift(liftId);
return true; return true;
} }
return false; return false;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!