From a7c8452ad33ae2f9fa6de326ee85054f60bad8c0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:18:52 +0800
Subject: [PATCH] 解决冲突

---
 Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
index dee62c7..d5cfa71 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
+++ b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
@@ -45,7 +45,7 @@
         /// <param name="locateNo">鍌ㄤ綅鍙�</param>
         /// <param name="msg">鐗╂枡缂栫爜銆佸悕绉般�佹壒娆″彿</param>
         /// <returns></returns>
-        List<StockDetailDto> GetCheckStockDetailList(string houseNo,string roadwayNo,string locateNo,string msg);
+        List<StockDetailDto> GetCheckStockDetailList(string houseNo,string roadwayNo,string locateNo,string msg, int page, int limit, out int count);
 
         /// <summary>
         /// 鑾峰彇缂栬緫鐩樼偣鍗曟椂淇℃伅

--
Gitblit v1.8.0