料架交换问题

DeviceLibrary/bean/job/ChargeJob.cs

@@ -27,7 +27,6 @@ namespace DeviceLibrary
         /// <param name="agv"></param>
         /// <param name="agv"></param>
         public override Job Run(AgvInfo agv)
         public override Job Run(AgvInfo agv)
         {
         {
-            Job job = this;
             agv.SetJobContext(new bean.agv.JobContext()
             agv.SetJobContext(new bean.agv.JobContext()
             {
             {
             });
             });
@@ -41,14 +40,14 @@ namespace DeviceLibrary
                     JobParam.CrossDoor.IsIn = false;
                     JobParam.CrossDoor.IsIn = false;
                     JobParam.CrossDoor.IsAir = true;
                     JobParam.CrossDoor.IsAir = true;
                     GenJobCallBack(this.GetType(), RunStep.CHARGE_OUTAIR, JobParam);
                     GenJobCallBack(this.GetType(), RunStep.CHARGE_OUTAIR, JobParam);
-                    job = new CrossDoorJob(JobParam);
+                    return new CrossDoorJob(JobParam);
                 }
                 }
                 else
                 else
                 {
                 {
                     JobRunStep.ToNextStep(RunStep.CHARGE_OUTAIR);
                     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))
                 if (!ChargePileManager.HasEmpty(agv, out ChargePile charge))
                 {
                 {
@@ -88,7 +87,7 @@ namespace DeviceLibrary
                     }
                     }
                     else if (agv.Battery >= BatteryMin)
                     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)))
                         if (job != null && ((job is ChargeJob) || (job is StandyJob)))
                         {
                         {
                         }
                         }
@@ -117,7 +116,7 @@ namespace DeviceLibrary
                     }
                     }
                     else if (agv.Battery >= ChargePileManager.GetChargePiles().BatteryMin)
                     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)))
                         if (job != null && ((job is ChargeJob) || (job is StandyJob)))
                         {
                         {
                         }
                         }
@@ -139,7 +138,7 @@ namespace DeviceLibrary
                 JobRunStep.EndJob();
                 JobRunStep.EndJob();
                 return null;
                 return null;
             }
             }
-            return job;
+            return this;
         }
         }
 
 
         /// <summary>
         /// <summary>