From d11b1f9c98e8765d3cee15abd4474b0e05a5acbc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 01 三月 2025 10:33:56 +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 | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 1 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 ac5eaf8..2e13b15 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,6 +12,7 @@
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;
@@ -33,12 +34,17 @@
private readonly IBasicService _basicService;
private readonly IOutboundService _outboundService;
private readonly IInboundService _inboundService;
+ private readonly IInvokeERPService _invokeERPService;
+ private readonly IReturnOrderService _returnOrderService;
- public ErpController(IBasicService basicService, IOutboundService outboundService, IInboundService inboundService)
+ public ErpController(IBasicService basicService, IOutboundService outboundService, IInboundService inboundService,
+ IInvokeERPService invokeERPService, IReturnOrderService returnOrderService)
{
_basicService = basicService;
_outboundService = outboundService;
_inboundService = inboundService;
+ _invokeERPService = invokeERPService;
+ _returnOrderService = returnOrderService;
}
/// <summary>
@@ -118,5 +124,70 @@
if (content.Status) return Instance.OK();
else return Instance.Error(content.Message);
}
+
+ /// <summary>
+ /// 鎺ユ敹ERP閫�鏂欏崟淇℃伅
+ /// </summary>
+ [HttpPost, Route("ReturnOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ReturnOrder([FromBody] Root<ErpReturnOrderDTO> model)
+ {
+ WebResponseContent content = _returnOrderService.ReturnOrder(model.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
+ }
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱鍗曟帴鏀�(璋冩嫈鍏ヤ粨,瀹緵鍥炴敹,鐗╂枡閿�鍞��璐�)
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ReceiveWarehousingOrder([FromBody] Root<ErpInOrderDTO> model)
+ {
+ WebResponseContent content = _inboundService.InbounOrderService.ReceiveWarehousingOrder(model.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
+ }
+ /// <summary>
+ /// 鎺ㄩ�丒RP鍑哄簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
+ public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
+ {
+ return _invokeERPService.InvokeOutStandardsApi(issueModel);
+ }
+ /// <summary>
+ /// 鎺ㄩ�丒RP鏀惰揣
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
+ public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
+ {
+ return _invokeERPService.InvokeMatReceiveApi(receiveModel);
+ }
+ /// <summary>
+ /// 鎺ㄩ�丒RP鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
+ public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
+ {
+ return _invokeERPService.InvokeInboundOrderApi(inboundModel);
+ }
+ /// <summary>
+ /// 鎺ㄩ�丒RP閫�鏂欎笂鎶�
+ /// </summary>
+ [HttpPost, Route("InvokeReturnApi"), AllowAnonymous]
+ public string InvokeReturnApi([FromBody] ERPReturnModel returnModel)
+ {
+ return _invokeERPService.InvokeReturnApi(returnModel);
+ }
+ /// <summary>
+ /// ERP鐩樿耽/浜忎笂鎶ユ帴鍙ｈ皟鐢�
+ /// </summary>
+ [HttpPost, Route("InvokeTakeStockApi"), AllowAnonymous]
+ public string InvokeTakeStockApi([FromBody] ERPTakeStockModel takeModel)
+ {
+ return _invokeERPService.InvokeTakeStockApi(takeModel);
+ }
}
}
--
Gitblit v1.9.3