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_IOutboundService/IProOutOrderService.cs |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IProOutOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IProOutOrderService.cs"
index 1c69ef7..a1960cb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IProOutOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IProOutOrderService.cs"
@@ -18,16 +18,32 @@
         /// 鎺ユ敹鎴愬搧鍑哄簱鍗�
         /// </summary>
         /// <returns></returns>
-        WebResponseContent ProductDeliveryOrder(ErpProOutOrderDTO outOrderDTO);
+        Task<WebResponseContent> ProductDeliveryOrder(ErpProOutOrderDTO outOrderDTO);
         /// <summary>
         /// 鎴愬搧鍑哄緟鍙戣揣鍖�(骞冲簱)+鍚屾ERP鍑哄簱(宸茬粦瀹氬嚭搴撳崟搴撳瓨)
         /// </summary>
         /// <returns></returns>
-        WebResponseContent OutProductPK(string[] OutPKCodes, string ProOutNo);
+        WebResponseContent OutProductPK(SaveModel saveModel, string ProOutNo);
+        ///// <summary>
+        ///// 鎴愬搧鍑哄緟鍙戣揣鍖�(骞冲簱)+鍚屾ERP鍑哄簱(鏈粦瀹氬嚭搴撳崟搴撳瓨)
+        ///// </summary>
+        ///// <returns></returns>
+        //WebResponseContent OutProductNoPK(string[] OutPKCodes, string ProOutNo);
+        WebResponseContent GetProOutOrders(SaveModel saveModel);
         /// <summary>
-        /// 鎴愬搧鍑哄緟鍙戣揣鍖�(骞冲簱)+鍚屾ERP鍑哄簱(鏈粦瀹氬嚭搴撳崟搴撳瓨)
+        /// 鑾峰彇鏄庣粏
+        /// </summary>
+        /// <param name="keyId"></param>
+        /// <returns></returns>
+        WebResponseContent GetOrderDetails(int keyId);
+        /// <summary>
+        /// 鏌ヨERP璁㈠崟鎵i櫎搴撳瓨鏁伴噺
+        /// </summary>
+        Task <WebResponseContent> OutProErpSync(string outProOrderNo);
+        /// <summary>
+        /// 鍑哄簱鍗曟壂鐮佸悓姝RP
         /// </summary>
         /// <returns></returns>
-        WebResponseContent OutProductNoPK(string[] OutPKCodes, string ProOutNo);
+        Task<WebResponseContent> OutProScanCodeSync(SaveModel saveModel);
     }
 }

--
Gitblit v1.9.3