From b51a65433d6102f2f8f00226404d9ca3808404af Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期四, 02 一月 2025 22:23:17 +0800 Subject: [PATCH] 打印托盘号 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 99 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 87 insertions(+), 12 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 6e357a9..33ab334 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> @@ -18,15 +21,15 @@ { } - /// <summary> - /// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS - /// </summary> - /// <returns></returns> - [HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous] - public WebResponseContent PushTasksToWCS() - { - return Service.PushTasksToWCS(); - } + ///// <summary> + ///// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS + ///// </summary> + ///// <returns></returns> + //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous] + //public WebResponseContent PushTasksToWCS() + //{ + // return Service.PushTasksToWCS(); + //} /// <summary> /// 鐢宠鍏ュ簱浠诲姟 @@ -35,17 +38,20 @@ /// <param name="stationCode"></param> /// <returns></returns> [HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous] - public WebResponseContent RequestInboundTask(string palletCode, string stationCode) + public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel) { - return Service.RequestInboundTask(palletCode, stationCode); + return Service.RequestInboundTask(saveModel); } + //public WebResponseContent RequestInboundTask(string palletCode, string stationCode) + //{ + // return Service.RequestInboundTask(palletCode, stationCode); + //} /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 /// </summary> /// <param name="taskNum">浠诲姟鍙�</param> /// <param name="roadwayNo">宸烽亾鍙�</param> - /// <param name="palletType">鎵樼洏绫诲瀷</param> /// <returns></returns> [HttpPost, HttpGet, Route("AssignInboundTaskLocation"), AllowAnonymous] public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo) @@ -63,5 +69,74 @@ { return Service.InboundTaskCompleted(taskNum); } + + /// <summary> + /// 鐢熸垚鍑哄簱浠诲姟 + /// </summary> + /// <param name="orderDetailId"></param> + /// <param name="stockSelectViews"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous] + public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody]List<StockSelectViewDTO> stockSelectViews) + { + return Service.GenerateOutboundTask(orderDetailId, stockSelectViews); + } + + /// <summary> + /// 鐢熸垚鍑哄簱浠诲姟 + /// </summary> + /// <param name="keys"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous] + public WebResponseContent GenerateOutboundTask(int[] keys) + { + return Service.GenerateOutboundTask(keys); + } + + /// <summary> + /// 鍑哄簱浠诲姟瀹屾垚 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <returns></returns> + [HttpPost, HttpGet, Route("OutboundTaskCompleted"), AllowAnonymous] + public WebResponseContent OutboundTaskCompleted(int taskNum) + { + 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); + } } } -- Gitblit v1.9.3