Skip to content

张东亮 / Qisda-SO1037-AGVDispatch

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ed7e3a8b 由 张东亮
选项

异常状态上报恢复

1 个父辈 dd8af787
内嵌 并排
正在显示 7 个修改的文件 包含 33 行增加 和 33 行删除
DeviceLibrary/bean/job/LiftToLinesJob.cs
...@@ -229,9 +229,9 @@ namespace DeviceLibrary ...@@ -229,9 +229,9 @@ namespace DeviceLibrary
else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval)) else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
{ {
// //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分" // //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分"
// manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.agvButton,
// $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"),true); $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true);
} }
} }
else if (JobRunStep.IsStep(RunStep.SD_LiftToLine_10_CheckNextLine)) else if (JobRunStep.IsStep(RunStep.SD_LiftToLine_10_CheckNextLine))
...@@ -421,9 +421,9 @@ namespace DeviceLibrary ...@@ -421,9 +421,9 @@ namespace DeviceLibrary
//请求电梯 //请求电梯
lift.LiftContext.Request(JobParam.GetMissionInfo(), agv, true); lift.LiftContext.Request(JobParam.GetMissionInfo(), agv, true);
////上报运输状态 ////上报运输状态
//manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
// service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.SrcNode.Name, service.model.TransportStatus.ModeStr.auto, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.SrcNode.Name, service.model.TransportStatus.ModeStr.auto,
// $"等待电梯到达超时")); $"等待电梯到达超时"));
} }
......
DeviceLibrary/bean/job/LineOneToManyJob.cs
...@@ -134,9 +134,9 @@ namespace DeviceLibrary.bean.job ...@@ -134,9 +134,9 @@ namespace DeviceLibrary.bean.job
JobRunStep.ToNextStep(RunStep.SD_Line_OneToMany_06_CheckNextLine); JobRunStep.ToNextStep(RunStep.SD_Line_OneToMany_06_CheckNextLine);
runInfo = $"{JobParam.CurTargetNode.AliceName}无需人员确认"; runInfo = $"{JobParam.CurTargetNode.AliceName}无需人员确认";
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
//manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.status, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.status, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton,
//$"卸货{ JobParam.CurTargetNode.Name }")); $"卸货{JobParam.CurTargetNode.Name}"));
} }
} }
else if (JobRunStep.IsStep(RunStep.SD_Line_OneToMany_05_WaitConfirm)) else if (JobRunStep.IsStep(RunStep.SD_Line_OneToMany_05_WaitConfirm))
...@@ -156,9 +156,9 @@ namespace DeviceLibrary.bean.job ...@@ -156,9 +156,9 @@ namespace DeviceLibrary.bean.job
else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval)) else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
{ {
//报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分" //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分"
// manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.error, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.error, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton,
// $"等待{ JobParam.CurTargetNode.Name }确认超时{timeoutval.ToString("f2")}分"),true); $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true);
} }
} }
else if (JobRunStep.IsStep(RunStep.SD_Line_OneToMany_06_CheckNextLine)) else if (JobRunStep.IsStep(RunStep.SD_Line_OneToMany_06_CheckNextLine))
......
DeviceLibrary/bean/job/LineToLiftJob.cs
...@@ -233,9 +233,9 @@ namespace DeviceLibrary ...@@ -233,9 +233,9 @@ namespace DeviceLibrary
//请求电梯 //请求电梯
lift.LiftContext.Request(JobParam.GetMissionInfo(), agv); lift.LiftContext.Request(JobParam.GetMissionInfo(), agv);
////上报运输状态 ////上报运输状态
//manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
// service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.auto, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.auto,
// $"等待电梯到达超时")); $"等待电梯到达超时"));
} }
} }
else if (JobRunStep.IsStep(RunStep.LineToLift_05_01_ToStandby)) else if (JobRunStep.IsStep(RunStep.LineToLift_05_01_ToStandby))
......
DeviceLibrary/bean/job/LineToLineJob.cs
...@@ -109,9 +109,9 @@ namespace DeviceLibrary.bean.job ...@@ -109,9 +109,9 @@ namespace DeviceLibrary.bean.job
else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval)) else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
{ {
//报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分" //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分"
// manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.error, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.error, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton,
// $"等待{ JobParam.CurTargetNode.Name }确认超时{timeoutval.ToString("f2")}分"), true); $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true);
} }
} }
} }
......
DeviceLibrary/bean/job/SteelLiftToLinesJob.cs
...@@ -174,9 +174,9 @@ namespace DeviceLibrary.bean.job ...@@ -174,9 +174,9 @@ namespace DeviceLibrary.bean.job
else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval)) else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
{ {
//报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分" //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分"
// manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.agvButton,
// $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true); $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true);
} }
} }
else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_10_CheckNextLine)) else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_10_CheckNextLine))
......
DeviceLibrary/bean/job/SteelLiftToStorageJob.cs
...@@ -168,9 +168,9 @@ namespace DeviceLibrary.bean.job ...@@ -168,9 +168,9 @@ namespace DeviceLibrary.bean.job
else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval)) else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
{ {
//报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分" //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分"
// manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.agvButton,
// $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true); $"等待{JobParam.CurTargetNode.Name}确认超时{timeoutval.ToString("f2")}分"), true);
} }
} }
else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_10_CheckNextLine)) else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_10_CheckNextLine))
...@@ -407,9 +407,9 @@ namespace DeviceLibrary.bean.job ...@@ -407,9 +407,9 @@ namespace DeviceLibrary.bean.job
lift.LiftContext.Request(missionInfo, agv); lift.LiftContext.Request(missionInfo, agv);
System.Threading.Thread.Sleep(1000); System.Threading.Thread.Sleep(1000);
//上报运输状态 //上报运输状态
//manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
// service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.SrcNode.Name, service.model.TransportStatus.ModeStr.auto, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.SrcNode.Name, service.model.TransportStatus.ModeStr.auto,
// $"等待电梯到达超时")); $"等待电梯到达超时"));
} }
} }
else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_22_CheckLiftStatus)) else if (JobRunStep.IsStep(RunStep.Steel_LiftToLine_22_CheckLiftStatus))
......
DeviceLibrary/bean/job/SteelLineToLiftJob.cs
...@@ -113,9 +113,9 @@ namespace DeviceLibrary ...@@ -113,9 +113,9 @@ namespace DeviceLibrary
else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval)) else if (JobRunStep.IsTimeOut(WaitTimeOut, out double timeoutval))
{ {
//报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分" //报警，$"等待{JobParam.CurTargetNode.AliceName}的人员确认超时{timeoutval}分"
// manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
//service.model.TransportStatus.TypeStr.error, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton, service.model.TransportStatus.TypeStr.error, agv.Name, agv.Place.Name, service.model.TransportStatus.ModeStr.agvButton,
// $"等待{JobParam.SrcNode.Name}确认超时{timeoutval.ToString("f2")}分"),true); $"等待{JobParam.SrcNode.Name}确认超时{timeoutval.ToString("f2")}分"), true);
} }
} }
else if (JobRunStep.IsStep(RunStep.LineToLift_WaitConfirm)) else if (JobRunStep.IsStep(RunStep.LineToLift_WaitConfirm))
...@@ -217,9 +217,9 @@ namespace DeviceLibrary ...@@ -217,9 +217,9 @@ namespace DeviceLibrary
//请求电梯 //请求电梯
lift.LiftContext.Request(JobParam.GetMissionInfo(), agv); lift.LiftContext.Request(JobParam.GetMissionInfo(), agv);
//上报运输状态 //上报运输状态
//manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId, manager.UploadManager.UploadTransportStatus(new service.model.TransportStatus(agv.CurJob.JobParam.GetMissionInfo().missionId,
// service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.auto, service.model.TransportStatus.TypeStr.error, agv.Name, JobParam.CurTargetNode.Name, service.model.TransportStatus.ModeStr.auto,
// $"等待电梯到达超时")); $"等待电梯到达超时"));
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!