From 225d11e2ddaa55d1d482201cb4d89c9486cdba69 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 20 六月 2025 12:27:52 +0800
Subject: [PATCH] 更新代码
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 739828f..7e56cfb 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"
@@ -17,13 +17,13 @@
{
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IRouterExtension _routerExtension;
- private readonly WebSocketServer _webSocketServer;
+ //private readonly WebSocketServer _webSocketServer;
- public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension, WebSocketServer webSocketServer) : base(service)
+ public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension/*, WebSocketServer webSocketServer*/) : base(service)
{
_httpContextAccessor = httpContextAccessor;
_routerExtension = routerExtension;
- _webSocketServer = webSocketServer;
+ //_webSocketServer = webSocketServer;
}
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
@@ -78,19 +78,28 @@
{
return WebResponseContent.Instance.OK(data: _routerExtension.GetEndPoint(startPoint, routeType));
}
-
- [HttpPost, HttpGet, Route("WebSocketPushMessage"), AllowAnonymous]
- public WebResponseContent WebSocketPushMessage(string message)
+ [HttpPost, HttpGet, Route("AgvCarrying"), AllowAnonymous]
+ public WebResponseContent AgvCarrying(int row, int startColumn, int endColumn, int layer, int targetLayer)
{
- try
- {
- _webSocketServer.PublishAllClientPayload(message);
- return WebResponseContent.Instance.OK();
- }
- catch(Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ return Service.AgvCarrying(row, startColumn, endColumn, layer, targetLayer);
+ }
+ //[HttpPost, HttpGet, Route("WebSocketPushMessage"), AllowAnonymous]
+ //public WebResponseContent WebSocketPushMessage(string message)
+ //{
+ // try
+ // {
+ // _webSocketServer.PublishAllClientPayload(message);
+ // return WebResponseContent.Instance.OK();
+ // }
+ // catch(Exception ex)
+ // {
+ // return WebResponseContent.Instance.Error(ex.Message);
+ // }
+ //}
+ [HttpPost, HttpGet, Route("RecWMSTaskCompleted"), AllowAnonymous]
+ public WebResponseContent RecWMSTaskCompleted(int taskNum)
+ {
+ return Service.RecWMSTaskCompleted(taskNum);
}
}
}
--
Gitblit v1.9.3