From 959aa7cefa8f416452444160cdd4edbea2cadae7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 07 十一月 2024 16:53:45 +0800
Subject: [PATCH] 合并冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 52abe4a..7583011 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -23,9 +23,9 @@
}
/// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
+ /// 浠诲姟瀹屾垚
/// </summary>
- /// <param name="saveModel">鍑哄簱鏁版嵁</param>
+ /// <param name="saveModel">浠诲姟鍙�</param>
/// <returns>鎴愬姛鎴栧け璐�</returns>
[HttpGet, Route("CompleteTaskAsync"), AllowAnonymous]
public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
@@ -54,4 +54,15 @@
{
return await Service.RequestTaskAsync(input);
}
+
+ /// <summary>
+ /// 绌烘墭鐩樿姹�
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestTrayTaskAsync")]
+ public async Task<WebResponseContent> RequestTrayTaskAsync([FromBody] string position, int tag, string areaCdoe, List<string> roadways)
+ {
+ return await Service.RequestTrayTaskAsync(position, tag, areaCdoe, roadways);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3