From f10e29b77659f6b7db1cf8d0e0fc5387b958e2c5 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 17 七月 2024 16:54:08 +0800
Subject: [PATCH] Merge branch 'wxw'

---
 Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index c679920..c5939bc 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -5,6 +5,8 @@
 using WMS.Entity.DataEntity;
 using System.Collections.Generic;
 using System.Xml;
+using System.Threading.Tasks;
+using SqlSugar;
 
 namespace WMS.IBLL.IBllSoServer
 {
@@ -47,7 +49,7 @@
         /// <param name="limit"></param>
         /// <param name="count"></param>
         /// <returns></returns>
-        List<ExportNoticeDto> GetExportNoticeList(string no,string type, string status, string LotNo,int? logisticsId,string isWave, string isDespatch,string waveNo, int page, int limit, out int count);
+        Task<List<ExportNoticeDto>> GetExportNoticeList(GetExportNoticeVm model, RefAsync<int> count);
 
         /// <summary>
         /// 鑾峰彇娣诲姞鎴栦慨鏀瑰嚭搴撳崟鏄庣粏鎵�鏄剧ず鐨勫簱瀛樻暟鎹簮
@@ -108,8 +110,7 @@
         /// <param name="limit"></param>
         /// <param name="count"></param>
         /// <returns></returns>
-        List<DataStockDetail> GetPalletNoOutList(string skuNo, string skuName, string palletNo, string lotNo,
-            string inspectMark, string bitPalletMark, int page, int limit, out int count);
+        Task<List<DataStockDetail>> GetPalletNoOutList(GetPalletNoOutVm model, RefAsync<int> count);
 
         /// <summary>
         /// 鎵樼洏涓嬪彂鍑哄簱

--
Gitblit v1.8.0