From 0f925aa31ef78144d24878433302917c33d04c8d Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 23 十月 2024 08:27:39 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/StatisticalController.cs | 102 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 90 insertions(+), 12 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 66dae9a..4168244 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 IDataBoxInfoServer _dataBoxInfo; //缁熻鎶ヨ〃
+ 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="dataBoxInfo">瀵煎嚭</param>
+ /// <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 搴撳瓨鏄庣粏
@@ -40,9 +43,9 @@
/// <param name="skuName"></param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList(string skuNo, string skuName)
+ public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName,string lotNo)
{
- List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName);
+ List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName,lotNo);
return Ok(new
{
data = StockList,
@@ -62,11 +65,16 @@
/// <param name="palletNo">鎵樼洏鏉＄爜</param>
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
+ /// <param name="HouseNo">鎵�灞炰粨搴�</param>
+ /// <param name="RoadwayNo">鎵�灞炲尯鍩�</param>
+ /// <param name="Type">鐗╂枡绫诲瀷</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
+ public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
+ string status, string inspectStatus, string ownerNo, string ownerName,string HouseNo,string AreaNo, string Type)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus);
+ List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo,
+ status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, Type);
return Ok(new
{
data = stockDetailsList,
@@ -94,11 +102,11 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
+ public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName)
{
try
{
- List<DataStockDetail> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -261,6 +269,52 @@
#endregion
+ #region 骞村害鎶ヨ〃
+
+ /// <summary>
+ /// 鑾峰彇骞存姤琛�
+ /// </summary>
+ /// <param name="StartTime"></param>
+ /// <param name="EndTime"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetAssSoInfo(string StartTime, string EndTime)
+ {
+ try
+ {
+ var skulist = _stock.GetAssSoInfo(StartTime, EndTime);
+ return Ok(new { code = 0, count = 0, data = skulist, msg = "鑾峰彇鎬婚噺鎴愬姛" });
+ }
+ catch (Exception ex)
+ {
+
+ return Ok(new { code = 1, count = 0, msg = ex.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇骞存姤琛ㄦ槑缁�
+ /// </summary>
+ /// <param name="skuNo"></param>
+ /// <param name="StartTime"></param>
+ /// <param name="EndTime"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetAssSoInfoDetail(string skuNo, string StartTime, string EndTime)
+ {
+ try
+ {
+ var infolist = _stock.GetAssSoInfoDetail(skuNo, StartTime, EndTime);
+ return Ok(new { code = 0, count = 0, data = infolist, msg = "鑾峰彇鏄庣粏鎴愬姛" });
+ }
+ catch (Exception ex)
+ {
+ return Ok(new { code = 1, count = 0, msg = ex.Message });
+ }
+ }
+
+ #endregion
+
#region 瀵煎嚭
/// <summary>
/// 瀵煎嚭搴撳瓨鎬婚噺
@@ -360,5 +414,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