From d8f650de070335be494c33d0705e8105b7a215d6 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期四, 26 十二月 2024 14:31:26 +0800
Subject: [PATCH] 同步
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
index 5fff145..883a71b 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -35,6 +35,17 @@
}
/// <summary>
+ /// 浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="saveModel">浠诲姟鍙�</param>
+ /// <returns>鎴愬姛鎴栧け璐�</returns>
+ //[HttpGet, Route("CompleteTaskByStation"), AllowAnonymous]
+ //public async Task<WebResponseContent> CompleteTaskByStation(int taskNum)
+ //{
+ // return await _taskService.CompleteTaskByStation(taskNum);
+ //}
+
+ /// <summary>
/// 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
@@ -50,10 +61,21 @@
/// </summary>
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("RequestTask")]
+ [HttpPost, AllowAnonymous, Route("RequestTaskAsync")]
public async Task<WebResponseContent> RequestTaskAsync([FromBody] RequestTaskDto input)
{
return await Service.RequestTaskAsync(input);
+ }
+
+ /// <summary>
+ /// 璇锋眰浠诲姟宸烽亾
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestInTask")]
+ public async Task<WebResponseContent> RequestInTask([FromBody] RequestTaskDto input)
+ {
+ return await Service.RequestInTask(input);
}
/// <summary>
@@ -81,12 +103,12 @@
/// <summary>
/// 绌烘墭鐩�&婊＄洏鍑哄簱璇锋眰
/// </summary>
- /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <param name="request">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("RequestTrayOutTaskAsync")]
public async Task<WebResponseContent> RequestTrayOutTaskAsync([FromBody] RequestOutTaskDto request)
{
- return await Service.RequestTrayOutTaskAsync(request.Position, request.Tag, request.AreaCdoe, request.Roadways);
+ return await Service.RequestTrayOutTaskAsync(request.Position, request.Tag, request.AreaCdoe, request.AreaCdoes, request.ProductionLine);
}
/// <summary>
@@ -100,4 +122,72 @@
return await Service.UpdateTaskStatus(input.TaskNum, input.TaskState);
}
+ /// <summary>
+ /// 鑾峰彇楂樻俯鍙嚭搴撳簱瀛�
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpGet, AllowAnonymous, Route("StockCheckingAsync")]
+ public WebResponseContent StockCheckingAsync()
+ {
+ return Service.StockCheckingAsync();
+ }
+
+ /// <summary>
+ /// 鍒涘缓鎸囧畾浠诲姟
+ /// </summary>
+ /// <param name="locationCode">璐т綅鍙�</param>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpGet, AllowAnonymous, Route("CreateAndSendOutboundTask")]
+ public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
+ {
+ return await Service.CreateAndSendOutboundTask(locationCode, palletCode);
+ }
+
+ /// <summary>
+ /// 闈欑疆NG鍏ュ簱
+ /// </summary>
+ /// <param name="locationCode">璐т綅鍙�</param>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestInBoundTaskNG")]
+ public async Task<WebResponseContent> RequestInBoundTaskNG([FromBody] RequestTaskDto input)
+ {
+ return await Service.CreateAndSendInboundTask(input.PalletCode, input.Position);
+ }
+
+ /// <summary>
+ /// 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("GetFROutTrayToCW")]
+ public async Task<WebResponseContent> GetFROutTrayToCW([FromBody] RequestTaskDto input)
+ {
+ return await Service.GetFROutTrayToCW(input);
+ }
+
+ /// <summary>
+ /// DTS鐏鍑哄簱
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("EmergencyTask")]
+ public WebResponseContent EmergencyTask([FromBody] object input)
+ {
+ return Service.EmergencyTask(input);
+ }
+
+
+ /// <summary>
+ /// CW3 鍑哄簱鑷冲寘瑁�
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestOutTaskToBZAsync")]
+ public async Task<WebResponseContent> RequestOutTaskToBZAsync([FromBody] RequestTaskDto input)
+ {
+ return await Service.RequestOutTaskToBZAsync(input);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3