From 131347ad63bb534b5abb6dbc979f0a47d780d8ff Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 15 一月 2025 15:06:05 +0800
Subject: [PATCH] ·
---
Wms/Wms/Controllers/StatisticalController.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 8a87f0e..10798d0 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -6,6 +6,7 @@
using WMS.Entity.DataEntity;
using WMS.IBLL.IDataServer;
using System.Security.Claims;
+using System.Threading.Tasks;
namespace Wms.Controllers
{
@@ -40,13 +41,19 @@
/// <summary>
/// 鑾峰彇搴撳瓨鎬婚噺
/// </summary>
- /// <param name="skuNo"></param>
- /// <param name="skuName"></param>
+ /// <param name="selectType">鏌ヨ绫诲瀷</param>
+ /// <param name="skuNo">鐗╂枡缂栫爜</param>
+ /// <param name="skuName">鐗╂枡鍚嶇О</param>
+ /// <param name="ownerNo">璐т富缂栫爜</param>
+ /// <param name="ownerName">璐т富鍚嶇О</param>
+ /// <param name="lotNo">鎵规</param>
+ /// <param name="status">搴撳瓨鐘舵��</param>
+ /// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo)
+ public async Task<IActionResult> GetInventoryList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus)
{
- List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName, ownerNo, ownerName, lotNo);
+ List<MateDataStockDto> StockList = await _stock.GetDataStockList(selectType, skuNo, skuName, ownerNo, ownerName, lotNo, status, inspectStatus);
return Ok(new
{
data = StockList,
@@ -68,9 +75,9 @@
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName,string startTime,string endTime)
+ public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName, startTime,endTime);
+ List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName, startTime, endTime);
return Ok(new
{
data = stockDetailsList,
@@ -98,11 +105,13 @@
/// <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, string ownerNo, string ownerName,string startTime,string endTIme)
+ 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)
{
try
{
- List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
+ bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -127,7 +136,8 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <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)
+ public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
{
try
{
@@ -341,7 +351,7 @@
/// <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 GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string startTime, string endTime)
{
List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1DaoChu(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, startTime, endTime);
return Ok(new
--
Gitblit v1.8.0