From 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 17 七月 2024 15:35:07 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Wms/Wms/Controllers/StatisticalController.cs | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index f115099..30131e0 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -16,19 +16,22 @@
/// 渚濊禆娉ㄥ叆
/// </summary>
private readonly IStockServer _stock; //缁熻鎶ヨ〃
- private readonly IStockDetailServer _stockDetail; //缁熻鎶ヨ〃
+ private readonly IStockDetailServer _stockDetail; //搴撳瓨绠辩爜鏄庣粏
private readonly IDataBoxInfoServer _dataBoxInfo; //瀵煎嚭
+ private readonly IStockInfoServer _stockInfo; //搴撳瓨淇℃伅
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="stock">缁熻鎶ヨ〃</param>
/// <param name="stockDetail">搴撳瓨绠辩爜鏄庣粏</param>
/// <param name="dataBoxInfo">瀵煎嚭</param>
- public StatisticalController(IStockServer stock, IStockDetailServer stockDetail, IDataBoxInfoServer dataBoxInfo)
+ /// <param name="stockInfo">搴撳瓨淇℃伅</param>
+ public StatisticalController(IStockServer stock, IStockDetailServer stockDetail, IDataBoxInfoServer dataBoxInfo, IStockInfoServer stockInfo)
{
_stock = stock; //缁熻鎶ヨ〃
- _stockDetail = stockDetail;
- _dataBoxInfo = dataBoxInfo;
+ _stockDetail = stockDetail; //搴撳瓨绠辩爜鏄庣粏
+ _dataBoxInfo = dataBoxInfo; //瀵煎嚭
+ _stockInfo = stockInfo; //搴撳瓨淇℃伅
}
#region 搴撳瓨鏄庣粏
@@ -406,5 +409,29 @@
}
#endregion
+
+ #region 搴撳瓨淇℃伅
+
+ /// <summary>
+ /// 鏍规嵁鏃堕棿鑾峰彇鏄剧ず搴撳瓨淇℃伅
+ /// </summary>
+ /// <param name="StartTime"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetDataStockInfo(string StartTime)
+ {
+ try
+ {
+ var list = _stockInfo.GetDataStockInfo(StartTime);
+ return Ok(new { code = 0, count = list.Count, data = list, msg = "鑾峰彇搴撳瓨淇℃伅鎴愬姛" });
+ }
+ catch (Exception ex)
+ {
+
+ return Ok(new { code = 1, count = 0, msg = ex.Message });
+ }
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0