From 78311f131e9dee7e183aecb76ead86510e2bbdfe Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 16 十二月 2024 16:41:00 +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 |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 3271fbf..19dafe1 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"
@@ -46,9 +46,9 @@
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceivePurchaseOrderSingle"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceivePurchaseOrder([FromBody] PurchaseOrderModel model)
+        public WebResponseContent ReceivePurchaseOrder([FromBody] Root model)
         {
-            return _purchaseOrderService.ReceivePurchaseOrder(model);
+            return _purchaseOrderService.ReceivePurchaseOrder(model.Content);
         }
 
         /// <summary>
@@ -57,9 +57,9 @@
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceiveSupplier"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceiveSupplier([FromBody] SupplierDTO model)
+        public WebResponseContent ReceiveSupplier([FromBody] Supplier model)
         {
-            return _supplierInfoService.ReceiveSupplier(model);
+            return _supplierInfoService.ReceiveSupplier(model.Content);
         }
 
         /// <summary>
@@ -68,9 +68,9 @@
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceiveMaterial"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceiveMaterial([FromBody] MaterielInfoDTO model)
+        public WebResponseContent ReceiveMaterial([FromBody] MaterielInfo model)
         {
-            return _materielInfoService.ReceiveMaterial(model);
+            return _materielInfoService.ReceiveMaterial(model.Content);
         }
 
         /// <summary>
@@ -79,9 +79,9 @@
         /// <param name="erpOutOrder"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceiveOutOrder"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceiveOutOrder([FromBody] ErpOutOrderDTO erpOutOrder)
+        public WebResponseContent ReceiveOutOrder([FromBody] ErpOutOrder erpOutOrder)
         {
-            return _outboundOrderService.ReceiveOutOrder(erpOutOrder);
+            return _outboundOrderService.ReceiveOutOrder(erpOutOrder.Content);
         }
     }
 }

--
Gitblit v1.9.3