From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Wms/Controllers/StatisticalController.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 30131e0..527e43c 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -65,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, string ownerNo, string ownerName)
+ 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 CategoryNo, string Type)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName);
+ List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo,
+ status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, CategoryNo, Type);
return Ok(new
{
data = stockDetailsList,
--
Gitblit v1.8.0