From 3dc164dc1ff1d08d29ec7ea5beabaf93a300a70b Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期四, 09 一月 2025 09:55:07 +0800 Subject: [PATCH] 辅料仓功能添加(空箱入库,空箱出库,AGV任务完成,组盘入库,拣选入库,入平库),WMS前端界面优化 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 6 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 2f7fd80..e63682a 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,36 @@ { 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) + { + return Service.OutEmpty(qty, address, WarehouseId); + } + + [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous] + public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode) + { + return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode); + } /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 @@ -74,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); } @@ -85,7 +114,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); } @@ -135,5 +164,15 @@ { 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