From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs |   65 +++++++++++++++++++++++++++++---
 1 files changed, 58 insertions(+), 7 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 1438bd1..4431333 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -129,9 +129,9 @@
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("ProductDeliveryOrder"), AllowAnonymous, MethodParamsValidate]
-        public ErpResponseContent ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
+        public async Task<ErpResponseContent> ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
         {
-            WebResponseContent content = _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
+            var content = await _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
             if (content.Status) return Instance.OK();
             else return Instance.Error(content.Message);
         }
@@ -143,7 +143,9 @@
         [HttpPost, Route("ProductWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
         public ErpResponseContent ProductWarehousingOrder([FromBody] Root<ErpProductWarehousingOrderDTO> root)
         {
-            return Instance.OK();
+            WebResponseContent content = _inboundService.ErpProInOrderService.ProductWarehousingOrder(root.Content);
+            if (content.Status) return Instance.OK();
+            else return Instance.Error(content.Message);
         }
         /// <summary>
         /// 鎴愬搧璋冩嫧鍑猴紙鐮斿彂锛�
@@ -151,9 +153,11 @@
         /// <param name="root"></param>
         /// <returns></returns>
         [HttpPost, Route("ProductTransferOrder"), AllowAnonymous, MethodParamsValidate]
-        public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrder> root)
+        public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrderDTO> root)
         {
-            return Instance.OK();
+            WebResponseContent content = _outboundService.ErpProTransferOrderService.ProductTransferOrder(root.Content);
+            if (content.Status) return Instance.OK();
+            else return Instance.Error(content.Message);
         }
         /// <summary>
         /// 鎴愬搧鎶ュ簾鍑哄簱鍗曟帴鏀�
@@ -179,9 +183,11 @@
         /// 閿�鍞寚娲惧崟鎺ユ敹
         /// </summary>
         [HttpPost, Route("ProductSpecifyVer"), AllowAnonymous, MethodParamsValidate]
-        public ErpResponseContent ProductSpecifyVer([FromBody] Root<ErpProductSpecifyVerDTO> root)
+        public async Task<ErpResponseContent> ProductSpecifyVerAsync([FromBody] Root<ErpProductSpecifyVerDTO> root)
         {
-            return Instance.OK();
+            var content = await _outboundService.ProOutOrderService.ProductSpecifyVer(root.Content);
+            if (content.Status) return Instance.OK();
+            else return Instance.Error(content.Message);
         }
         /// <summary>
         /// 鎺ユ敹ERP閫�鏂欏崟淇℃伅
@@ -221,6 +227,24 @@
         public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
         {
             return _invokeERPService.InvokeMatReceiveApi(receiveModel);
+        }
+        /// <summary>
+        /// 鎺ㄩ�丒RP鏉ユ枡IQC璐ㄦ
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("InvokeCheckOrderApi"), AllowAnonymous]
+        public string InvokeCheckOrderApi([FromBody] ERPCheckModel checkModel)
+        {
+            return _invokeERPService.InvokeCheckOrderApi(checkModel);
+        }
+        /// <summary>
+        /// 鎺ㄩ�丒RP鐗╂枡閫佹
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("InvokeInspectApi"), AllowAnonymous]
+        public string InvokeInspectApi([FromBody] ERPInspectModel eRPInspectModel)
+        {
+            return _invokeERPService.InvokeInspectApi(eRPInspectModel);
         }
         /// <summary>
         /// 鎺ㄩ�丒RP鍏ュ簱
@@ -294,5 +318,32 @@
         {
             return _invokeERPService.InvokeProStockCheckApi(stockCheckModel);
         }
+        /// <summary>
+        /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("InvokeProSaleCustomer"), AllowAnonymous]
+        public string InvokeProSaleCustomer(string saleOrder)
+        {
+            return _invokeERPService.InvokeProSaleCustomer(saleOrder);
+        }
+        /// <summary>
+        /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("InvokeOutProErpSync"), AllowAnonymous]
+        public string InvokeOutProErpSync(string outProOrderNo)
+        {
+            return _invokeERPService.InvokeOutProErpSync(outProOrderNo);
+        }
+        /// <summary>
+        /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("InvokeProInErpStatic"), AllowAnonymous]
+        public string InvokeProInErpStatic(string partNum, string partNumWithRev)
+        {
+            return _invokeERPService.InvokeProInErpStatic(partNum, partNumWithRev);
+        }
     }
 }

--
Gitblit v1.9.3