Commit 0a52a015 张东亮

料架交换问题

1 个父辈 d889f99d
......@@ -27,7 +27,6 @@ namespace DeviceLibrary
/// <param name="agv"></param>
public override Job Run(AgvInfo agv)
{
Job job = this;
agv.SetJobContext(new bean.agv.JobContext()
{
});
......@@ -41,14 +40,14 @@ namespace DeviceLibrary
JobParam.CrossDoor.IsIn = false;
JobParam.CrossDoor.IsAir = true;
GenJobCallBack(this.GetType(), RunStep.CHARGE_OUTAIR, JobParam);
job = new CrossDoorJob(JobParam);
return new CrossDoorJob(JobParam);
}
else
{
JobRunStep.ToNextStep(RunStep.CHARGE_OUTAIR);
}
}
else if(JobRunStep.IsStep(RunStep.CHARGE_OUTAIR))
else if (JobRunStep.IsStep(RunStep.CHARGE_OUTAIR))
{
if (!ChargePileManager.HasEmpty(agv, out ChargePile charge))
{
......@@ -88,7 +87,7 @@ namespace DeviceLibrary
}
else if (agv.Battery >= BatteryMin)
{
job = AGVManager.control.GetJob(agv);
Job job = AGVManager.control.GetJob(agv);
if (job != null && ((job is ChargeJob) || (job is StandyJob)))
{
}
......@@ -117,7 +116,7 @@ namespace DeviceLibrary
}
else if (agv.Battery >= ChargePileManager.GetChargePiles().BatteryMin)
{
job = AGVManager.control.GetJob(agv);
Job job = AGVManager.control.GetJob(agv);
if (job != null && ((job is ChargeJob) || (job is StandyJob)))
{
}
......@@ -139,7 +138,7 @@ namespace DeviceLibrary
JobRunStep.EndJob();
return null;
}
return job;
return this;
}
/// <summary>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!