From 4e506fb732bc1c0c23d5996ffb8d81eb7e9b4b65 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 02 八月 2025 08:55:47 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/StatisticalController.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 10798d0..83c294e 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -106,12 +106,13 @@
/// <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 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);
+ bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -137,11 +138,12 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
- string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
try
{
- List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus);
+ List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo,
+ lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus, WareHouseNo, AreaNo);
return Ok(new { data = boxInfo, code = 0, msg = "鑾峰彇绠辩爜鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -327,11 +329,12 @@
/// </summary>
/// <param name="skuNo"></param>
/// <param name="skuName"></param>
+ /// <param name="InspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryListDaoChu(string skuNo, string skuName)
+ public IActionResult GetInventoryListDaoChu(string skuNo, string skuName, string InspectStatus)
{
- List<MateDataStockDto> StockList = _stock.GetDataStockListDaoChu(skuNo, skuName);
+ List<MateDataStockDto> StockList = _stock.GetDataStockListDaoChu(skuNo, skuName, InspectStatus);
return Ok(new
{
data = StockList,
@@ -339,7 +342,7 @@
msg = "瀵煎嚭搴撳瓨鎬婚噺鎴愬姛"
});
}
- /// <summary>
+ /// <summary>GetDataStockListDaoChu
/// 瀵煎嚭搴撳瓨鏄庣粏
/// </summary>
/// <param name="skuNo">鐗╂枡缂栫爜</param>
@@ -351,9 +354,9 @@
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string startTime, string endTime)
+ public IActionResult GetDataStockList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string status, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1DaoChu(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, startTime, endTime);
+ List<StockDetailDto> stockDetailsList = _stock.GetDataStockList1DaoChu(skuNo, skuName, lotNo, locatNo, status, inspectStatus, ownerNo, ownerName, startTime, endTime);
return Ok(new
{
data = stockDetailsList,
--
Gitblit v1.8.0