From 8ec9fab52eea2b110ad4e1a0b2300fead0018cd1 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期日, 21 十二月 2025 15:20:36 +0800
Subject: [PATCH] 1111
---
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs b/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
index 2d3154b..0aa2e06 100644
--- a/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
+++ b/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
@@ -12,23 +12,23 @@
public class MesInvItemStocksController : ControllerBase
{
private readonly MesInvItemStocksManager m = new();
-
+
/// <summary>
- /// 鑾峰彇鍙��璐х墿鏂欏簱瀛�
+ /// 鑾峰彇鍙��璐х墿鏂欏簱瀛�(甯﹀垎椤靛拰鎼滅储)
/// </summary>
+ /// <param name="searchDto">鎼滅储璇锋眰鍙傛暟</param>
/// <returns></returns>
- [HttpPost("GetReturnableStocks")]
- public ResponseResult GetReturnableStocks()
+ [HttpPost("GetReturnableStocksWithPaging")]
+ public ResponseResult GetReturnableStocksWithPaging([FromBody] ReturnableStockSearchDto searchDto)
{
try
{
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetReturnableStocks();
+ var result = m.GetReturnableStocks(searchDto);
return new ResponseResult
{
status = 0,
- message = "OK",
- data = resultInfos
+ message = "鏌ヨ鎴愬姛",
+ data = result
};
}
catch (Exception ex)
@@ -72,4 +72,32 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ /// <summary>
+ /// 瀵煎嚭鍙��璐х墿鏂欏簱瀛樹负Excel
+ /// </summary>
+ /// <param name="searchDto">鎼滅储璇锋眰鍙傛暟</param>
+ /// <returns>Excel鏂囦欢</returns>
+ [HttpPost("ExportReturnableStocks")]
+ public IActionResult ExportReturnableStocks([FromBody] ReturnableStockSearchDto searchDto)
+ {
+ try
+ {
+ var fileBytes = m.ExportReturnableStocksToExcel(searchDto);
+ var fileName = $"鍙��璐х墿鏂欏簱瀛榑{DateTime.Now:yyyyMMddHHmmss}.xlsx";
+
+ return File(fileBytes,
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ fileName);
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(new ResponseResult
+ {
+ status = 1,
+ message = $"瀵煎嚭澶辫触: {ex.Message}",
+ data = null
+ });
+ }
+ }
}
--
Gitblit v1.9.3