From f947d43adfe6a204b6afe920ce88a30d78015f1d Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期五, 28 二月 2025 10:44:44 +0800 Subject: [PATCH] 板料优化,成品流程,测试架... --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 107 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 db78b1a..b4557ec 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" @@ -67,10 +67,43 @@ return Service.OutEmpty(qty, address, WarehouseId, barcode); } + /// <summary> + /// WCS鐢宠鍏ュ簱浠诲姟(鍒嗛厤璐т綅) + /// </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> + /// 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.DeviceRequestInboundTaskSimple(stationCode, palletCode); + } + + /// <summary> + /// + /// </summary> + /// <param name="stationCode"></param> + /// <param name="palletCode"></param> + /// <param name="roadwayNos"></param> + /// <param name="heightType"></param> + /// <returns></returns> + [HttpPost, HttpGet, Route("DeviceRequestInboundTaskByRoadways"), AllowAnonymous] + public WebResponseContent DeviceRequestInboundTaskByRoadways(string stationCode, string palletCode, int heightType, [FromBody] List<string> roadwayNos) + { + return Service.DeviceRequestInboundTaskByRoadways(stationCode, palletCode, roadwayNos, heightType); } /// <summary> @@ -83,6 +116,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> @@ -109,14 +155,26 @@ } /// <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> /// 鐢熸垚鍑哄簱浠诲姟 /// </summary> /// <param name="keys"></param> /// <returns></returns> [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous] - public WebResponseContent GenerateOutboundTask([FromBody] int[] keys) + public WebResponseContent GenerateOutboundTasks([FromBody] int[] keys) { - return Service.GenerateOutboundTask(keys); + return Service.GenerateOutboundTasks(keys); } /// <summary> @@ -176,21 +234,63 @@ } /// <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.AssignRoadwayByHeight(roadwayNos, taskNum, heightType); + } + + /// <summary> + /// + /// </summary> + /// <param name="roadwayNos"></param> + /// <param name="palletCode"></param> + /// <param name="heightType"></param> + /// <returns></returns> + [HttpPost, Route("AssignRoadwayByHeightAndCode"), AllowAnonymous] + public WebResponseContent AssignRoadwayByHeightAndCode([FromBody] List<string> roadwayNos, string palletCode, int heightType = 0) + { + return Service.AssignRoadwayByHeightAndCode(roadwayNos, palletCode, 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) + public WebResponseContent AssignRoadway(int taskNum, [FromBody] List<string> roadwayNos,int heightType) { - return Service.AssignRoadway(taskNum, roadwayNos); + return Service.AssignRoadway(taskNum, roadwayNos, heightType); } + /// <summary> + /// 鍒嗛厤宸烽亾 + /// </summary> + /// <param name="roadwayNos"></param> + /// <returns></returns> [HttpPost, Route("SingleAssignRoadway"), AllowAnonymous] - public WebResponseContent AssignRoadway([FromBody] List<string> roadwayNos) + public WebResponseContent SingleAssignRoadway([FromBody] List<string> roadwayNos) { - return Service.AssignRoadway(roadwayNos); + return Service.SingleAssignRoadway(roadwayNos); + } + + /// <summary> + /// + /// </summary> + /// <param name="orderId"></param> + /// <returns></returns> + [HttpPost, Route("HandSubstrateOut")] + public WebResponseContent HandSubstrateOut(int orderId) + { + return Service.HandSubstrateOut(orderId); } /// <summary> -- Gitblit v1.9.3