From b58b6f92ab3f7caee1199d15d118e496122e5849 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 04 十二月 2025 16:42:30 +0800
Subject: [PATCH] 还原代码
---
Wms/Wms/Controllers/StatisticalController.cs | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 365d505..f288d6b 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -25,6 +25,8 @@
private readonly IStockDetailServer _stockDetail; //缁熻鎶ヨ〃
private readonly IDataBoxInfoServer _dataBoxInfo; //瀵煎嚭
private readonly IStockInfoServer _stockInfo; //搴撳瓨淇℃伅
+
+
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -39,6 +41,76 @@
_dataBoxInfo = dataBoxInfo;
_stockInfo = stockInfo; //搴撳瓨淇℃伅
}
+
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨鐗╂枡绫诲瀷鍒嗗竷
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetGoodsTypeFb()
+ {
+ IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetGoodsTypeFb();
+ return Ok(new
+ {
+ data = dtoIE,
+ code = 0,
+ msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+ });
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨璐ㄩ噺鐘舵�佸垎甯�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetQualityStatusFb()
+ {
+ IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetQualityStatusFb();
+ return Ok(new
+ {
+ data = dtoIE,
+ code = 0,
+ msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+ });
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鐘跺喌鎬�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetWareHouseState()
+ {
+ WarehouseStateDto dto = _stock.GetWareHouseState();
+ return Ok(new
+ {
+ data = dto,
+ code = 0,
+ msg = "鑾峰彇浠撳簱姒傚喌鎴愬姛"
+ });
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鐘跺喌璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetWareHouseStateInfo()
+ {
+ IEnumerable<WarehouseUseDto> dtoIE = _stock.GetWareHouseStateInfo();
+ return Ok(new
+ {
+ data = dtoIE,
+ code = 0,
+ msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+ });
+ }
+
+
#region 搴撳瓨鏄庣粏
@@ -94,6 +166,7 @@
#region 鎵樼洏鏄庣粏
+
/// <summary>
/// 鑾峰彇鎵樼洏鏄庣粏
/// </summary>
@@ -107,16 +180,19 @@
/// <param name="bitPalletMark">闆舵墭鏍囪</param>
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
+ /// <param name="ownerNo">璐т富缂栫爜</param>
+ /// <param name="ownerName">璐т富鍚嶇О</param>
+ /// <param name="startTime">寮�濮嬫椂闂�</param>
+ /// <param name="endTIme">缁撴潫鏃堕棿</param>
+ /// <param name="WareHouseNo">鎵�灞炰粨搴�</param>
+ /// <param name="AreaNo">鎵�灞炲尯鍩�</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, string ownerNo, string ownerName,
- string startTime, string endTIme,string WareHouseNo,string AreaNo)
+ 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, string startTime, string endTIme, string WareHouseNo, string AreaNo)
{
try
{
- List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
- bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -175,7 +251,7 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
+ public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
try
--
Gitblit v1.8.0