Commit 429e0b20 张东亮

去充电桩时到达后再检测新任务,避免半路收到任务小车掉头造成堵塞

1 个父辈 d48ce3bf
...@@ -171,6 +171,10 @@ namespace DeviceLibrary ...@@ -171,6 +171,10 @@ namespace DeviceLibrary
{ {
return GetMissionGuidByTaskName(taskName).Equals(agv.CurTaskGUID) && curTaskState.Equals(SettingString.Executing); return GetMissionGuidByTaskName(taskName).Equals(agv.CurTaskGUID) && curTaskState.Equals(SettingString.Executing);
} }
public static bool CheckChargeIsStarting(Agv_Info agv)
{
return agv.MissionText.Contains("充电中")|| agv.MissionText.Contains("Charging");
}
/// <summary> /// <summary>
/// 获取Job任务状态 /// 获取Job任务状态
/// </summary> /// </summary>
......
...@@ -190,7 +190,8 @@ namespace DeviceLibrary ...@@ -190,7 +190,8 @@ namespace DeviceLibrary
} }
else if (curJobStep.IsStep(CHARGE_STEP.WAIT_REACH_CHARGE_STATION)) else if (curJobStep.IsStep(CHARGE_STEP.WAIT_REACH_CHARGE_STATION))
{ {
if (MissionSys.CheckTaskIsOK(agv, CurTarName,CurTaskState)) //if (MissionSys.CheckTaskIsOK(agv, CurTarName,CurTaskState))
if(MissionSys.CheckChargeIsStarting(agv))
{ {
curJobStep.ToNextStep(CHARGE_STEP.WAIT_REACH_CHARGE_OK); curJobStep.ToNextStep(CHARGE_STEP.WAIT_REACH_CHARGE_OK);
runInfo = "开始充电任务"; runInfo = "开始充电任务";
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!