Commit 43725118 张东亮

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

1 个父辈 1e411ef7
...@@ -172,7 +172,10 @@ namespace DeviceLibrary ...@@ -172,7 +172,10 @@ namespace DeviceLibrary
{ {
return taskName.Contains(SettingString.AutoCharge) && agv.CurTaskState.Equals(SettingString.Executing); return taskName.Contains(SettingString.AutoCharge) && agv.CurTaskState.Equals(SettingString.Executing);
} }
public static bool CheckChargeIsStarting(Agv_Info agv)
{
return agv.MissionText.Contains("充电中")||agv.MissionText.Contains("Charging");
}
public static bool CheckEnterOrLeaveFinished(Agv_Info agv, string actionName, string curTaskState) public static bool CheckEnterOrLeaveFinished(Agv_Info agv, string actionName, string curTaskState)
{ {
LogUtil.debug(agv.Name + " 检查进出料是否结束: " + actionName + " " + curTaskState); LogUtil.debug(agv.Name + " 检查进出料是否结束: " + actionName + " " + curTaskState);
......
...@@ -114,7 +114,7 @@ namespace DeviceLibrary ...@@ -114,7 +114,7 @@ namespace DeviceLibrary
} }
else if (curJobStep.IsStep(CHARGE_STEP.WAIT_REACH_CHARGE_STATION)) else if (curJobStep.IsStep(CHARGE_STEP.WAIT_REACH_CHARGE_STATION))
{ {
if (CommonVar.CheckTaskFinished(agv, CurTaskName)) if (CommonVar.CheckChargeIsStarting(agv))
{ {
RecordRunLog(agv, curJobStep.CurStep(), runInfo, agv.Place); RecordRunLog(agv, curJobStep.CurStep(), runInfo, agv.Place);
curJobStep.ToNextStep(CHARGE_STEP.WAIT_REACH_CHARGE_OK); curJobStep.ToNextStep(CHARGE_STEP.WAIT_REACH_CHARGE_OK);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!