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 | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
index a1f9570..e67e658 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsTaskController.cs
@@ -13,7 +13,7 @@
namespace CMS.Plugin.HIAWms.Controller
{
/// <summary>
- /// Wms浠诲姟绠＄悊琛ㄦ湇鍔�
+ /// Wms浠诲姟绠＄悊鏈嶅姟
/// </summary>
[ApiController]
[TypeFilter(typeof(CMSLanguageFilter))]
@@ -35,7 +35,7 @@
}
/// <summary>
- /// 鑾峰彇Wms浠诲姟绠＄悊琛�
+ /// 鑾峰彇Wms浠诲姟绠＄悊
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
@@ -47,7 +47,7 @@
}
/// <summary>
- /// 鍒嗛〉鑾峰彇Wms浠诲姟绠＄悊琛ㄧ殑鍒楄〃.
+ /// 鍒嗛〉鑾峰彇Wms浠诲姟绠＄悊鐨勫垪琛�.
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
@@ -59,7 +59,7 @@
}
/// <summary>
- /// 鍒涘缓Wms浠诲姟绠＄悊琛�
+ /// 鍒涘缓Wms浠诲姟绠＄悊
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
@@ -71,7 +71,7 @@
}
/// <summary>
- /// 鏇存柊Wms浠诲姟绠＄悊琛�
+ /// 鏇存柊Wms浠诲姟绠＄悊
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
@@ -85,7 +85,7 @@
}
/// <summary>
- /// 鍏嬮殕Wms浠诲姟绠＄悊琛�
+ /// 鍏嬮殕Wms浠诲姟绠＄悊
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
@@ -98,7 +98,7 @@
}
/// <summary>
- /// 鍒犻櫎Wms浠诲姟绠＄悊琛�
+ /// 鍒犻櫎Wms浠诲姟绠＄悊
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
@@ -111,7 +111,7 @@
}
/// <summary>
- /// 鎵归噺鍒犻櫎Wms浠诲姟绠＄悊琛�
+ /// 鎵归噺鍒犻櫎Wms浠诲姟绠＄悊
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
@@ -123,7 +123,7 @@
}
/// <summary>
- /// 璋冩暣鎺掑簭Wms浠诲姟绠＄悊琛�
+ /// 璋冩暣鎺掑簭Wms浠诲姟绠＄悊
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
@@ -135,7 +135,7 @@
}
/// <summary>
- /// 瀵煎叆Wms浠诲姟绠＄悊琛�
+ /// 瀵煎叆Wms浠诲姟绠＄悊
/// </summary>
/// <returns></returns>
[Authorize]
@@ -164,7 +164,7 @@
}
/// <summary>
- /// 瀵煎嚭Wms浠诲姟绠＄悊琛�
+ /// 瀵煎嚭Wms浠诲姟绠＄悊
/// </summary>
/// <returns></returns>
[HttpGet]
@@ -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