From a5006fb9abb416b08b7d99236944f725a09c5d55 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 14:02:30 +0800
Subject: [PATCH] 测试架退库优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index fc5ab5c..89f653a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -6,6 +6,7 @@
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Tasks;
namespace WIDESEAWCS_WCSServer.Controllers.Task
{
@@ -14,9 +15,12 @@
public class TaskController : ApiBaseController<ITaskService, Dt_Task>
{
private readonly IHttpContextAccessor _httpContextAccessor;
- public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor) : base(service)
+ private readonly IRouterExtension _routerExtension;
+
+ public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension) : base(service)
{
_httpContextAccessor = httpContextAccessor;
+ _routerExtension = routerExtension;
}
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
@@ -25,17 +29,23 @@
return Service.ReceiveWMSTask(taskDTOs);
}
+ [HttpPost, HttpGet, Route("RequestAssignLocation"), AllowAnonymous]
+ public string? RequestAssignLocation(int taskNum, string roadwayNo)
+ {
+ return Service.RequestAssignLocation(taskNum, roadwayNo);
+ }
+
[HttpPost, HttpGet, Route("UpdateTaskExceptionMessage")]
public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
{
return Service.UpdateTaskExceptionMessage(taskNum, message);
}
- [HttpPost, HttpGet, Route("UpdateTaskStatusToNext")]
- public WebResponseContent UpdateTaskStatusToNext(int taskNum)
- {
- return Service.UpdateTaskStatusToNext(taskNum);
- }
+ //[HttpPost, HttpGet, Route("UpdateTaskStatusToNext")]
+ //public WebResponseContent UpdateTaskStatusToNext(int taskNum)
+ //{
+ // return Service.UpdateTaskStatusToNext(taskNum);
+ //}
[HttpPost, HttpGet, Route("TaskStatusRecovery")]
public WebResponseContent TaskStatusRecovery(int taskNum)
@@ -48,5 +58,21 @@
{
return Service.RollbackTaskStatusToLast(taskNum);
}
+
+ /// <summary>
+ /// 鍥炲AGV瀹夊叏淇″彿
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("SendSecureReplyToAgv")]
+ public WebResponseContent SendSecureReplyToAgv(int taskNum)
+ {
+ return Service.SendSecureReplyToAgv(taskNum);
+ }
+ [HttpPost, HttpGet, Route("GetRouteEndPoint"), AllowAnonymous]
+ public WebResponseContent GetRouteEndPoint(string startPoint, int routeType)
+ {
+ return WebResponseContent.Instance.OK(data: _routerExtension.GetEndPoint(startPoint, routeType));
+ }
}
}
--
Gitblit v1.9.3