From 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 16:21:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

---
 Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index 80b504d..c2b65d3 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -17,7 +17,7 @@
         /// </summary>
         /// <param name="model">妯″瀷</param>
         /// <returns></returns>
-        SoResInfo ErpAddExportNotice(SoInfo model);
+        SoResInfo ErpAddExportNotice(SendSoVm model);
         /// <summary>
         /// 鑾峰彇鎵ц瀹屾垚鐨勫崟鎹彂閫佽嚦erp
         /// </summary>
@@ -25,7 +25,7 @@
         /// <param name="url">涓婁紶璺緞</param>
         /// <param name="userId">鎿嶄綔浜�</param>
         /// <returns></returns>
-        bool FinishSo(int id, string url, int userId);
+        bool FinishSo(int id, string url, string url2, int userId);
         /// <summary>
         /// 鎺ュ彈鐢熶骇鍙枡淇″彿鎺ュ彛
         /// </summary>
@@ -123,6 +123,18 @@
         /// <returns></returns>
         List<OutCommandDto> IssuePalletNoOut(string palletNo, string outMode, int userId, string url, out string str);
 
+        /// <summary>
+        /// 鎵樼洏鍑哄簱锛堝瘑闆嗗簱锛�
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="outMode"></param>
+        /// <param name="userId"></param>
+        /// <param name="url"></param>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        List<OutCommandDto> IssuePalletNoOutMk(string palletNo, string outMode, int userId, string url, out string str);
+
         //------------------------------------------------------------------------------------------
         #region 澶囨枡
 
@@ -163,6 +175,8 @@
         /// <returns>鍑哄簱鍗曠殑浠撳簱鍙�</returns>
         string GetHouseBySo(string soNo);
 
+        string GetHouseByPalletNo(string palletNo);
+
         /// <summary>
         /// 涓嬪彂鍑哄簱 绔嬪簱
         /// </summary>

--
Gitblit v1.8.0