From 8fcd7a67e4391a5f1fbdb590c2a3f913aeb2a0a0 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期二, 31 三月 2026 14:11:23 +0800
Subject: [PATCH] PP平库功能上线，PDA优化，部分问题点优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 77 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 30 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 8ef1ce2..7274af6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -354,49 +354,66 @@
if (taskTypeGroup == TaskTypeGroup.OutbondGroup)
{
task.AgvTaskNum = item.AGVArea + DateTime.Now.ToString("yyMMdd") + item.TaskNum;
- List<Dt_Router> routers = routersAll.Where(x => x.InOutType == item.TaskType && item.AGVArea == x.NextPosi).ToList();
- if (routers.FirstOrDefault() == null)
+ if(item.AGVArea == "AGV_PP")
{
- return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
- }
- router = routers.FirstOrDefault();
- task.NextAddress = router?.StartPosi ?? "";
- task.DeviceCode = item.RoadWay;
- if (item.RoadWay.Contains("ZH"))
- {
- task.TaskState = TaskStatusEnum.New.ObjToInt();
+ task.NextAddress = item.TargetAddress;
+ task.DeviceCode = item.RoadWay;
}
else
{
- task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
+ List<Dt_Router> routers = routersAll.Where(x => x.InOutType == item.TaskType && item.AGVArea == x.NextPosi).ToList();
+ if (routers.FirstOrDefault() == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
+ }
+ router = routers.FirstOrDefault();
+ task.NextAddress = router?.StartPosi ?? "";
+ task.DeviceCode = item.RoadWay;
+ if (item.RoadWay.Contains("ZH"))
+ {
+ task.TaskState = TaskStatusEnum.New.ObjToInt();
+ }
+ else
+ {
+ task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
+ }
}
}
else
{
- if (task.Roadway!="SC01_ZH")
+ if (item.AGVArea == "AGV_PP")
{
task.AgvTaskNum = item.AGVArea + DateTime.Now.ToString("yyMMdd") + item.TaskNum;
- }
- List<Dt_Router> routers = routersAll.Where(x => x.InOutType == item.TaskType && item.AGVArea == x.StartPosi).ToList();
- if (routers.FirstOrDefault() == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
- }
- router = routers.FirstOrDefault();
- Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x=>x.StationCode== router?.NextPosi);
- if (stationManger == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮珯鍙伴厤缃俊鎭�");
- }
- task.NextAddress = stationManger?.AGVStationCode ?? "";
- task.DeviceCode = stationManger?.Remark ?? "";
- if (task.Roadway != "SC01_ZH")
- {
- task.TaskState = TaskStatusEnum.AGV_Execute.ObjToInt();
+ task.NextAddress = item.TargetAddress;
+ task.DeviceCode = item.RoadWay;
}
else
{
- task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
+ if (task.Roadway != "SC01_ZH")
+ {
+ task.AgvTaskNum = item.AGVArea + DateTime.Now.ToString("yyMMdd") + item.TaskNum;
+ }
+ List<Dt_Router> routers = routersAll.Where(x => x.InOutType == item.TaskType && item.AGVArea == x.StartPosi).ToList();
+ if (routers.FirstOrDefault() == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
+ }
+ router = routers.FirstOrDefault();
+ Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == router?.NextPosi);
+ if (stationManger == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮珯鍙伴厤缃俊鎭�");
+ }
+ task.NextAddress = stationManger?.AGVStationCode ?? "";
+ task.DeviceCode = stationManger?.Remark ?? "";
+ if (task.Roadway != "SC01_ZH")
+ {
+ task.TaskState = TaskStatusEnum.AGV_Execute.ObjToInt();
+ }
+ else
+ {
+ task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
+ }
}
}
}
--
Gitblit v1.9.3