From 413f243b73ef073f4ac83889fda2f5bf6d1e727c Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期三, 08 一月 2025 10:17:32 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 61 ++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 5 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" index e53c4fa..343e79e 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" @@ -10,6 +10,9 @@ namespace WIDESEA_WMSServer.Controllers.TaskInfo { + /// <summary> + /// 浠诲姟 + /// </summary> [Route("api/Task")] [ApiController] public class TaskController : ApiBaseController<ITaskService, Dt_Task> @@ -39,10 +42,19 @@ { return Service.RequestInboundTask(saveModel); } - //public WebResponseContent RequestInboundTask(string palletCode, string stationCode) - //{ - // return Service.RequestInboundTask(palletCode, stationCode); - //} + + /// <summary> + /// + /// </summary> + /// <param name="stationCode"></param> + /// <param name="roadwayNo"></param> + /// <param name="palletCode"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous] + public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode) + { + return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode); + } /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 @@ -85,7 +97,7 @@ /// <param name="keys"></param> /// <returns></returns> [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous] - public WebResponseContent GenerateOutboundTask(int[] keys) + public WebResponseContent GenerateOutboundTask([FromBody] int[] keys) { return Service.GenerateOutboundTask(keys); } @@ -101,10 +113,49 @@ return Service.OutboundTaskCompleted(taskNum); } + /// <summary> + /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴� + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="locationCode"></param> + /// <returns></returns> [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous] public WebResponseContent IsRelocation(int taskNum, string locationCode) { return Service.IsRelocation(taskNum, locationCode); } + + /// <summary> + /// 浠诲姟瀹屾垚 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <returns></returns> + [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous] + public WebResponseContent TaskCompleted(int taskNum) + { + return Service.TaskCompleted(taskNum); + } + + /// <summary> + /// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="agvDescription"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous] + public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "") + { + return Service.PushTasksToWCSSingle(taskNum, agvDescription); + } + /// <summary> + /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟 + /// </summary> + /// <param name="id"></param> + /// <returns></returns> + [HttpPost, Route("Outbound"), AllowAnonymous] + public WebResponseContent Outbound(int id) + { + return Service.Outbound(id); + } } } -- Gitblit v1.9.3