From 04624e7dae0291aba33967f754573236324d2a62 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期四, 24 七月 2025 17:02:31 +0800
Subject: [PATCH] Merge branch 'master' into djp

---
 Wms/WMS.IBLL/IDataServer/IStockServer.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index 8d3d2e0..0b7fb63 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -112,7 +112,7 @@
         /// <param name="skuNo">鐗╂枡缂栫爜</param>
         /// <param name="skuName">鐗╂枡鍚嶇О</param>
         /// <returns></returns>
-        List<MateDataStockDto> GetDataStockListDaoChu(string skuNo, string skuName);
+        List<MateDataStockDto> GetDataStockListDaoChu(string skuNo, string skuName, string InspectStatus);
 
         /// <summary>
         /// 瀵煎嚭搴撳瓨鏄庣粏
@@ -127,7 +127,7 @@
         /// <param name="startTime">寮�濮嬫椂闂�</param>
         /// <param name="endTime">缁撴潫鏃堕棿</param>
         /// <returns></returns>
-        List<StockDetailDto> GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string startTime, string endTime);
+        List<StockDetailDto> GetDataStockList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string status, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime);
         #endregion
     }
 }

--
Gitblit v1.8.0