From b489f865bab00bedfce5e8f772095600b8034ac0 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 7b10097..7ec2844 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"
@@ -4,6 +4,7 @@
 using WIDESEA_Common.CommonEnum;
 using WIDESEA_Core;
 using WIDESEA_Core.BaseController;
+using WIDESEA_DTO.Basic;
 using WIDESEA_DTO.Stock;
 using WIDESEA_DTO.Task;
 using WIDESEA_ITaskInfoService;
@@ -270,6 +271,16 @@
         }
 
         /// <summary>
+        /// 鎵嬪姩绉诲簱
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, HttpGet, Route("ManualRelocation"), AllowAnonymous]
+        public WebResponseContent ManualRelocation([FromBody] RelocationDTO relocationDTO)
+        {
+            return Service.ManualRelocation(relocationDTO);
+        }
+
+        /// <summary>
         /// 浠诲姟瀹屾垚
         /// </summary>
         /// <param name="taskNum">浠诲姟鍙�</param>
@@ -413,10 +424,10 @@
         /// </summary>
         /// <param name="taskNum">浠诲姟鍙�</param>
         /// <returns></returns>
-        [HttpPost, HttpGet, Route("TaskHandCa"), AllowAnonymous]
-        public async Task<WebResponseContent> TaskHandCancel(int taskNum ,int warehouseId)
+        [HttpPost, HttpGet, Route("TaskHandCancel"), AllowAnonymous]
+        public async Task<WebResponseContent> TaskHandCancel(int taskNum)
         {
-            return await Service.TaskHandCancel(taskNum,warehouseId);
+            return await Service.TaskHandCancel(taskNum);
         }
     }
 }

--
Gitblit v1.9.3