From c9fc48e1d1c9d8e7828bbe045d23e2c7479e7613 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期二, 14 一月 2025 00:10:28 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 112 insertions(+), 4 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 343e79e..3b3657b 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,8 +35,7 @@ /// <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) @@ -44,7 +44,31 @@ } /// <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); + } + + /// <summary> + /// WCS鐢宠鍏ュ簱浠诲姟(鍒嗛厤璐т綅) /// </summary> /// <param name="stationCode"></param> /// <param name="roadwayNo"></param> @@ -57,6 +81,18 @@ } /// <summary> + /// WCS鐢宠鍏ュ簱浠诲姟(涓嶅垎閰嶈揣浣�) + /// </summary> + /// <param name="stationCode"></param> + /// <param name="palletCode"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous] + public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode) + { + return Service.DeviceRequestInboundTask(stationCode, palletCode); + } + + /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 /// </summary> /// <param name="taskNum">浠诲姟鍙�</param> @@ -66,6 +102,19 @@ public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo) { return Service.AssignInboundTaskLocation(taskNum, roadwayNo); + } + + /// <summary> + /// + /// </summary> + /// <param name="taskNum"></param> + /// <param name="roadwayNo"></param> + /// <param name="heightType"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("AssignInboundTaskLocationByHeight"), AllowAnonymous] + public WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType) + { + return Service.AssignInboundTaskLocationByHeight(taskNum, roadwayNo, heightType); } /// <summary> @@ -86,9 +135,21 @@ /// <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); + } + + /// <summary> + /// 骞冲簱鐩存帴鍑哄簱 + /// </summary> + /// <param name="orderDetailId"></param> + /// <param name="stockSelectViews"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("GeneratePKOutboundTask"), AllowAnonymous] + public WebResponseContent GeneratePKOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews) + { + return Service.GeneratePKOutboundTask(orderDetailId, stockSelectViews); } /// <summary> @@ -157,5 +218,52 @@ { return Service.Outbound(id); } + + /// <summary> + /// 鍒嗛厤宸烽亾(甯︿换鍔″彿鍙婇珮搴�) + /// </summary> + /// <param name="roadwayNos"></param> + /// <param name="taskNum"></param> + /// <param name="heightType"></param> + /// <returns></returns> + [HttpPost, Route("AssignRoadwayByHeight"), AllowAnonymous] + public WebResponseContent AssignRoadwayByHeight([FromBody] List<string> roadwayNos, int taskNum, int heightType = 0) + { + return Service.AssignRoadway(roadwayNos, taskNum, heightType); + } + + /// <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="roadwayNos"></param> + /// <returns></returns> + [HttpPost, Route("SingleAssignRoadway"), AllowAnonymous] + public WebResponseContent AssignRoadway([FromBody] List<string> roadwayNos) + { + return Service.AssignRoadway(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