1

DeviceLibrary/bean/job/SteelLiftToStorageJob.cs

@@ -38,7 +38,8 @@ namespace DeviceLibrary.bean.job
                 JobRunStep.ToNextStep(RunStep.Steel_LiftToLine_01_ToLift);
                 JobRunStep.ToNextStep(RunStep.Steel_LiftToLine_01_ToLift);
                 runInfo = $"任务开始：去{JobParam.SrcNode.AliceName}";
                 runInfo = $"任务开始：去{JobParam.SrcNode.AliceName}";
                 JobRunStep.Msg = runInfo;
                 JobRunStep.Msg = runInfo;
-                AllocateTask(agv, JobParam.SrcNode.Name);
+                //AllocateTask(agv, JobParam.SrcNode.Name);
+                ToLift(agv,JobParam.SrcNode.Name);  
             }
             }
             else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_01_ToLift))
             else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_01_ToLift))
             {
             {
@@ -289,7 +290,7 @@ namespace DeviceLibrary.bean.job
                 if (agv.TaskRunState.CheckTaskFinished(agv))
                 if (agv.TaskRunState.CheckTaskFinished(agv))
                 {
                 {
                     JobRunStep.ToNextStep(RunStep.Steel_LiftToLine_19_BackToLift);
                     JobRunStep.ToNextStep(RunStep.Steel_LiftToLine_19_BackToLift);
-                    MissionManager.ChangeSteelSrcNodes(JobParam.GetMissionInfo().missionId, "storage");
+                    MissionManager.ChangeSteelSrcNodes(JobParam.GetMissionInfo().missionId, SettingString.storage);
                     if (!string.IsNullOrEmpty(DataBufferManager.SteelTarget))
                     if (!string.IsNullOrEmpty(DataBufferManager.SteelTarget))
                     {
                     {
                         runInfo = $"收到钢网出库点：{DataBufferManager.SteelTarget}";
                         runInfo = $"收到钢网出库点：{DataBufferManager.SteelTarget}";

DeviceLibrary/bean/jobType/SteelLiftToLinesJobType.cs

@@ -24,7 +24,7 @@ namespace DeviceLibrary.bean.jobType
                             return null;
                             return null;
                         Node src = manager.NodeManager.GetNode(liftname, NodeType.Lift);
                         Node src = manager.NodeManager.GetNode(liftname, NodeType.Lift);
                         string[] dests = missionInfo.destinationPoint.Split(',');
                         string[] dests = missionInfo.destinationPoint.Split(',');
-                        Node dest = manager.NodeManager.GetNode(dests.Length > 1 ? dests[0] : lift.destinationPoint, NodeType.Node);
+                        Node dest = manager.NodeManager.GetNode(dests.Length > 1 ? dests[0] : missionInfo.destinationPoint, NodeType.Node);
                         JobParam jobParam = new JobParam(src, dest, null, missionInfo);
                         JobParam jobParam = new JobParam(src, dest, null, missionInfo);
                         jobParam.SteelShelfNode = NodeManager.GetNode(Common.AppConfigHelper.GetValue("SteelShelfPos", "3dwash"), NodeType.Node);
                         jobParam.SteelShelfNode = NodeManager.GetNode(Common.AppConfigHelper.GetValue("SteelShelfPos", "3dwash"), NodeType.Node);
                         if (dests.Length > 1)
                         if (dests.Length > 1)
@@ -49,6 +49,7 @@ namespace DeviceLibrary.bean.jobType
                             }
                             }
                         }
                         }
                         MissionManager.SetMissionOccupied(missionInfo, agv);
                         MissionManager.SetMissionOccupied(missionInfo, agv);
+                        LogUtil.info($"{agv.Name} 执行 SteelLiftToLinesJob：{JsonHelper.SerializeObject(missionInfo)}");
                         return new SteelLiftToLinesJob(jobParam);
                         return new SteelLiftToLinesJob(jobParam);
                     }
                     }
 
 
@@ -60,6 +61,7 @@ namespace DeviceLibrary.bean.jobType
                         JobParam jobParam = new JobParam(src, dest, null, missionInfo);
                         JobParam jobParam = new JobParam(src, dest, null, missionInfo);
                         //jobParam.SteelShelfNode = NodeManager.GetNode(Common.AppConfigHelper.GetValue("SteelShelfPos"), NodeType.Node);
                         //jobParam.SteelShelfNode = NodeManager.GetNode(Common.AppConfigHelper.GetValue("SteelShelfPos"), NodeType.Node);
                         MissionManager.SetMissionOccupied(missionInfo, agv);
                         MissionManager.SetMissionOccupied(missionInfo, agv);
+                        LogUtil.info($"{agv.Name} 执行 SteelLiftToStorageJob:{JsonHelper.SerializeObject(missionInfo)}");
                         return new SteelLiftToStorageJob(jobParam);
                         return new SteelLiftToStorageJob(jobParam);
                     }
                     }
                 }
                 }