From 17c0c88cb5419351e4f0bf498e4b9535c5b39197 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 21:55:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
index 8b805a4..e67e658 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
@@ -183,6 +183,30 @@
             await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets); 
             memoryStream.Seek(0L, SeekOrigin.Begin); 
             return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" }; 
-        } 
+        }
+
+        /// <summary>
+        /// 寮哄埗瀹屾垚浠诲姟
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("FinishTask")]
+        public async Task FinishTaskAsync(WmsTaskUpdateDto input)
+        {
+            await _wmsTaskAppService.FinishTaskAsync(input);
+        }
+
+        /// <summary>
+        /// 鍙栨秷浠诲姟
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("CancelTask")]
+        public async Task CancelTaskAsync(WmsTaskUpdateDto input)
+        {
+            await _wmsTaskAppService.CancelTaskAysnc(input);
+        }
     } 
 } 

--
Gitblit v1.9.3