From a6ea79849f0142b5280f0c5d4b15ecc83f0d015a Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 21 十二月 2024 09:52:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 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 cd5f8fd..662da3a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -28,7 +28,7 @@
/// </summary>
/// <param name="saveModel">浠诲姟鍙�</param>
/// <returns>鎴愬姛鎴栧け璐�</returns>
- [HttpGet, Route("CompleteTask"), AllowAnonymous]
+ [HttpGet, Route("CompleteTaskAsync"), AllowAnonymous]
public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
{
return await _taskService.CompleteAsync(taskNum);
@@ -103,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>
@@ -122,4 +122,48 @@
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>
+ /// 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+ /// </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);
+ //}
}
\ No newline at end of file
--
Gitblit v1.9.3