From 25246d39da4b74b54a844b36d8a50752917b81cc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 16:59:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialStockController.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialStockController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialStockController.cs
index 2b88542..c84b892 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialStockController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialStockController.cs
@@ -52,9 +52,21 @@
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
[HttpGet]
- public virtual Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync([FromQuery] GetWmsMaterialStocksInput input)
+ public virtual Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync([FromQuery] GetWmsMaterialStockInput input)
{
return _wmsmaterialstockAppService.GetListAsync(input);
+ }
+
+ /// <summary>
+ /// 鍝嚭鏉ユ槑缁�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("StockDetail")]
+ public async Task<PagedResultDto<WmsMaterialStockDto>> GetStockDetailAsync([FromQuery]GetWmsMaterialStockInput input)
+ {
+ return await _wmsmaterialstockAppService.GetStockDetailAsync(input);
}
/// <summary>
@@ -174,7 +186,7 @@
/// <returns></returns>
[HttpGet]
[Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialStocksInput input)
+ public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialStockInput input)
{
input.MaxResultCount = int.MaxValue;
var exportData = await _wmsmaterialstockAppService.ExportAsync(input);
--
Gitblit v1.9.3