From 98e221d6dc26183efab868ee5f11a65d5791304e Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期五, 19 九月 2025 08:02:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

---
 Wms/WMS.IBLL/IDataServer/IStockServer.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index 8d3d2e0..0d0a3b2 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -23,9 +23,11 @@
         /// <param name="lotNo">鎵规</param>
         /// <param name="status">搴撳瓨鐘舵��</param>
         /// <param name="inspectStatus">璐ㄦ鐘舵��</param>
+        /// <param name="wareHouseNo">鎵�灞炰粨搴�</param>
+        /// <param name="areaNo">鎵�灞炲尯鍩�</param>
         /// <returns></returns>
         Task<List<MateDataStockDto>> GetDataStockList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, 
-            string status, string inspectStatus);
+            string status, string inspectStatus, string wareHouseNo, string areaNo);
 
         /// <summary>
         /// 鑾峰彇搴撳瓨鏄庣粏
@@ -112,7 +114,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 +129,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