From 81cfbb34ad9092b19a2e3692786ee97f3646014b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 16 十二月 2024 21:30:46 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
index f2a5428..95be589 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
@@ -27,6 +27,16 @@
         }
 
         /// <summary>
+        /// 鏀惰揣瀹屾垚鍥炰紶ERP
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        [HttpPost, HttpGet, Route("FeedbackReceiveOrder")]
+        public WebResponseContent FeedbackReceiveOrder(int orderId)
+        {
+            return Service.FeedbackReceiveOrder(orderId);
+        }
+
         /// 鏌ヨ鏀惰揣鍗曚俊鎭�
         /// </summary>
         /// <returns></returns>
@@ -35,5 +45,17 @@
         {
             return Service.GetReceiveOrders(saveModel);
         }
+
+        /// <summary>
+        /// 鏀惰揣
+        /// </summary>
+        /// <param name="purchaseOrderId"></param>
+        /// <param name="lotNo"></param>
+        /// <returns></returns>
+        [HttpPost, HttpGet, Route("ReceiveAllOrder")]
+        public WebResponseContent ReceiveAllOrder(int purchaseOrderId, string lotNo)
+        {
+            return Service.ReceiveAllOrder(purchaseOrderId, lotNo);
+        }
     }
 }

--
Gitblit v1.9.3