From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新，WCS代码优化，出入库分配优化

---
 项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 88f10c2..72de6a0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -29,13 +29,13 @@
     {
         private readonly IBasicService _basicService;
         private readonly IInvokeERPService _invokeERPService;
-        private readonly IPurchaseOrderService _purchaseOrderService;
+        private readonly IInboundService _inboundService;
 
-        public ErpController(IBasicService basicService,IInvokeERPService invokeERPService,IPurchaseOrderService purchaseOrderService)
+        public ErpController(IBasicService basicService,IInvokeERPService invokeERPService, IInboundService inboundService)
         {
             _basicService = basicService;
             _invokeERPService = invokeERPService;
-            _purchaseOrderService = purchaseOrderService;
+            _inboundService = inboundService;
         }
         /// <summary>
         /// 娣诲姞浜屾湡鐗╂枡
@@ -89,7 +89,7 @@
 
         public WebResponseContent PurchaseInboundInfo([FromBody] ERPRoot<ERPPurchaseOrderDTO> eRPRoot)
         {
-            return _purchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
+            return _inboundService.PurchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
         }
         /// <summary>
         /// 娣诲姞浜屾湡閲囪喘閫�璐т俊鎭�
@@ -99,7 +99,7 @@
 
         public WebResponseContent PurchaseReturn([FromBody] ERPRoot<ERPReturnOrderDTO> eRPRoot)
         {
-            return _purchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
+            return _inboundService.PurchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
         }
         /// <summary>
         /// 娣诲姞浜屾湡閿�鍞嚭搴撲俊鎭�
@@ -109,7 +109,7 @@
 
         public WebResponseContent ProDeliveryOrder([FromBody] ERPRoot<ERPProDeliveryDTO> eRPRoot)
         {
-            return _purchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
+            return _inboundService.PurchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
         }
 
         /// <summary>
@@ -120,7 +120,18 @@
 
         public WebResponseContent ReceiveOut([FromBody] ERPRoot<ERPPickOutOrderDTO> eRPRoot)
         {
-            return _purchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
+            return _inboundService.PurchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
+        }
+
+        /// <summary>
+        /// 娣诲姞闈為噰璐敓浜у叆搴撳崟淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("ReceiveInbound"), AllowAnonymous]
+
+        public WebResponseContent ReceiveInbound([FromBody] ERPRoot<ERPInboundOrderDTO> eRPRoot)
+        {
+            return _inboundService.InboundOrderService.ReceiveInbound(eRPRoot.Content);
         }
 
 
@@ -132,11 +143,11 @@
 
         public WebResponseContent ProDeliveryBack([FromBody] ERPRoot<ERPProDeliverBackDTO> eRPRoot)
         {
-            return _purchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
+            return _inboundService.PurchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
         }
 
         /// <summary>
-        /// 鎺ㄩ�侀噰璐俊鎭�
+        /// ERP涓婁紶閲囪喘淇℃伅
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("ERPPurchaseUp"), AllowAnonymous]
@@ -145,7 +156,7 @@
             return _invokeERPService.ERPPurchaseUp(eRPPurchaseUpModel);
         }
         /// <summary>
-        /// 鎺ㄩ�侀噰璐俊鎭�
+        /// ERP鎴愬搧閿�鍞嚭搴撲笂浼犱俊鎭�
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("ERPProOutUp"), AllowAnonymous]
@@ -153,5 +164,23 @@
         {
             return _invokeERPService.ERPProOutUp(eRPProOutUpModel);
         }
+        /// <summary>
+        /// ERP涓婁紶鎴愬搧鍏ュ簱淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("ERPProInUp"), AllowAnonymous]
+        public string ERPProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
+        {
+            return _invokeERPService.ERPProInUp(eRPProInUpModel);
+        }
+        /// <summary>
+        /// ERP涓婁紶鍗�-鎴愬搧鍏ュ簱淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("ERPSemiProInUp"), AllowAnonymous]
+        public string ERPSemiProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
+        {
+            return _invokeERPService.ERPSemiProInUp(eRPProInUpModel);
+        }
     }
 }

--
Gitblit v1.9.3