From 96e6dc957aee5d20218ac8127a28db6a7e6ba6de Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期五, 10 一月 2025 10:00:52 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 67 +++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 16 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 4fd4a00..98dacb1 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" @@ -12,33 +12,37 @@ using WIDESEA_DTO.Basic; using WIDESEA_DTO.ERP; using WIDESEA_External.ERPService; +using WIDESEA_External.Model; using WIDESEA_IBasicRepository; using WIDESEA_IBasicService; using WIDESEA_IInboundRepository; using WIDESEA_IInboundService; +using WIDESEA_InboundService; using WIDESEA_IOutboundService; using WIDESEA_Model.Models; using static WIDESEA_DTO.ErpResponseContent; namespace WIDESEA_WMSServer.Controllers.ERP { + /// <summary> + /// ERP鎺ュ彛 + /// </summary> [Route("api/Erp")] [ApiController] public class ErpController : ControllerBase { - private readonly IPurchaseOrderRepository _purchaseOrderRepository; - private readonly IPurchaseOrderService _purchaseOrderService; - private readonly ISupplierInfoService _supplierInfoService; - private readonly IMaterielInfoService _materielInfoService; - private readonly IOutboundOrderService _outboundOrderService; + private readonly IBasicService _basicService; + private readonly IOutboundService _outboundService; + private readonly IInboundService _inboundService; + private readonly IInvokeERPService _invokeERPService; - public ErpController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService) + public ErpController(IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, + IInvokeERPService invokeERPService) { - _purchaseOrderRepository = purchaseOrderRepository; - _purchaseOrderService = purchaseOrderService; - _supplierInfoService = supplierInfoService; - _materielInfoService = materielInfoService; - _outboundOrderService = outboundOrderService; + _basicService = basicService; + _outboundService = outboundService; + _inboundService = inboundService; + _invokeERPService = invokeERPService; } /// <summary> @@ -46,10 +50,23 @@ /// </summary> /// <param name="model"></param> /// <returns></returns> - [HttpPost, Route("ReceivePurchaseOrderSingle"), AllowAnonymous, MethodParamsValidate] + [HttpPost, Route("ReceivePurchaseOrder"), AllowAnonymous, MethodParamsValidate] public ErpResponseContent ReceivePurchaseOrder([FromBody] Root<PurchaseOrderModel> model) { - WebResponseContent content = _purchaseOrderService.ReceivePurchaseOrder(model.Content); + WebResponseContent content = _inboundService.PurchaseOrderService.ReceivePurchaseOrder(model.Content); + if (content.Status) return Instance.OK(); + else return Instance.Error(content.Message); + } + + /// <summary> + /// 鎺ユ敹ERP浠撳簱鍛樺伐鍜岃川妫�鍛樺伐鏁版嵁 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost, Route("ReceiveUser"), AllowAnonymous, MethodParamsValidate] + public ErpResponseContent ReceiveUser([FromBody] Root<UserInfoDTO> model) + { + WebResponseContent content = _basicService.UserInfoService.ReceiveUser(model.Content); if (content.Status) return Instance.OK(); else return Instance.Error(content.Message); } @@ -62,7 +79,7 @@ [HttpPost, Route("ReceiveSupplier"), AllowAnonymous, MethodParamsValidate] public ErpResponseContent ReceiveSupplier([FromBody] Root<SupplierDTO> model) { - WebResponseContent content = _supplierInfoService.ReceiveSupplier(model.Content); + WebResponseContent content = _basicService.SupplierInfoService.ReceiveSupplier(model.Content); if (content.Status) return Instance.OK(); else return Instance.Error(content.Message); } @@ -75,7 +92,20 @@ [HttpPost, Route("ReceiveMaterial"), AllowAnonymous, MethodParamsValidate] public ErpResponseContent ReceiveMaterial([FromBody] Root<MaterielInfoDTO> model) { - WebResponseContent content = _materielInfoService.ReceiveMaterial(model.Content); + WebResponseContent content = _basicService.MaterielInfoService.ReceiveMaterial(model.Content); + if (content.Status) return Instance.OK(); + else return Instance.Error(content.Message); + } + + /// <summary> + /// 鎺ユ敹ERP瀹㈡埛淇℃伅 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost, Route("ReceiveCustomer"), AllowAnonymous, MethodParamsValidate] + public ErpResponseContent ReceiveCustomer([FromBody] Root<CustomerInfoDTO> model) + { + WebResponseContent content = _basicService.CustomerInfoService.ReceiveCustomer(model.Content); if (content.Status) return Instance.OK(); else return Instance.Error(content.Message); } @@ -88,9 +118,14 @@ [HttpPost, Route("ReceiveOutOrder"), AllowAnonymous, MethodParamsValidate] public ErpResponseContent ReceiveOutOrder([FromBody] Root<ErpOutOrderDTO> erpOutOrder) { - WebResponseContent content = _outboundOrderService.ReceiveOutOrder(erpOutOrder.Content); + WebResponseContent content = _outboundService.OutboundOrderService.ReceiveOutOrder(erpOutOrder.Content); if (content.Status) return Instance.OK(); else return Instance.Error(content.Message); } + [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous] + public string InvokeOutStandardsApi(ERPIssueModel issueModel) + { + return _invokeERPService.InvokeOutStandardsApi(issueModel); + } } } -- Gitblit v1.9.3