From 9be8d6e3232971246ec6cb2acac1ad4d05798e9b Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期六, 11 一月 2025 10:54:37 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 73 +++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 7 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 a42aa83..b5f0c14 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" @@ -5,6 +5,7 @@ using WIDESEA_Core; using WIDESEA_Core.BaseController; using WIDESEA_DTO.Stock; +using WIDESEA_DTO.Task; using WIDESEA_ITaskInfoService; using WIDESEA_Model.Models; @@ -34,18 +35,43 @@ /// <summary> /// 鐢宠鍏ュ簱浠诲姟 /// </summary> - /// <param name="palletCode"></param> - /// <param name="stationCode"></param> + /// <param name="saveModel"></param> /// <returns></returns> [HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous] public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel) { return Service.RequestInboundTask(saveModel); } - //public WebResponseContent RequestInboundTask(string palletCode, string stationCode) - //{ - // return Service.RequestInboundTask(palletCode, stationCode); - //} + + /// <summary> + /// 绌虹鍏ュ簱 + /// </summary> + /// <param name="barcode">鎵樼洏鍙�</param> + /// <param name="address">鍦板潃</param> + /// <returns></returns> + [HttpPost, HttpGet, Route("InEmpty"), AllowAnonymous] + public WebResponseContent InEmpty(string barcode, string address, int WarehouseId) + { + return Service.InEmpty(barcode, address, WarehouseId); + } + + /// <summary> + /// 绌虹鍑哄簱 + /// </summary> + /// <param name="qty">鏁伴噺</param> + /// <param name="address">鍦板潃</param> + /// <returns></returns> + [HttpPost, HttpGet, Route("OutEmpty"), AllowAnonymous] + public WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode) + { + return Service.OutEmpty(qty, address, WarehouseId,barcode); + } + + [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous] + public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode) + { + return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode); + } /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 @@ -77,7 +103,7 @@ /// <param name="stockSelectViews"></param> /// <returns></returns> [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous] - public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody]List<StockSelectViewDTO> stockSelectViews) + public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews) { return Service.GenerateOutboundTask(orderDetailId, stockSelectViews); } @@ -138,5 +164,38 @@ { 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); + } + + /// <summary> + /// 鍒嗛厤宸烽亾 + /// </summary> + /// <param name="taskNum"></param> + /// <param name="roadwayNos"></param> + /// <returns></returns> + [HttpPost, Route("AssignRoadway"), AllowAnonymous] + public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos) + { + return Service.AssignRoadway(taskNum, roadwayNos); + } + + /// <summary> + /// 淇敼浠诲姟鐘舵�� + /// </summary> + /// <param name="task"></param> + /// <returns></returns> + [HttpPost, Route("UpdateTaskInfo"), AllowAnonymous] + public WebResponseContent UpdateTaskInfo([FromBody] WCSTaskDTO task) + { + return Service.UpdateTaskInfo(task); + } } } -- Gitblit v1.9.3