From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
index 26760b3..1e4d934 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
@@ -32,11 +32,11 @@
         /// 鍏ュ簱瀹屾垚涓婃姤
         /// </summary>
         /// <returns></returns>
-        WebResponseContent FeedbackInboundOrder(Dt_InboundOrder inboundOrder);
+        WebResponseContent FeedbackInboundOrder(int inboundOrderId);
         /// <summary>
         /// 閫�鏂欏畬鎴愪笂鎶ヨ嚦ERP
         /// </summary>
-        public WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder);
+        WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder);
         /// <summary>
         /// 鏍规嵁浠撳簱鍜屾墭鐩樺彿鑾峰彇鎵樼洏绫诲瀷
         /// </summary>
@@ -47,5 +47,9 @@
         /// </summary>
         /// <returns></returns>
         WebResponseContent ReceiveWarehousingOrder(ErpInOrderDTO model);
+        /// <summary>
+        /// 鎴愬搧鍏ュ簱涓婁紶ERP
+        /// </summary>
+        WebResponseContent FeedbackProIn(Dt_MesProInOrder mesProInOrder);
     }
 }

--
Gitblit v1.9.3