From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码，ERP接口，MES接口优化，WMS业务优化等
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 14 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 c363599..88f10c2 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"
@@ -15,8 +15,8 @@
using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
+using WIDESEA_IInboundService;
using WIDESEA_Model.Models;
-using static WIDESEA_DTO.ErpResponseContent;
namespace WIDESEA_WMSServer.Controllers.ERP
{
@@ -29,54 +29,129 @@
{
private readonly IBasicService _basicService;
private readonly IInvokeERPService _invokeERPService;
+ private readonly IPurchaseOrderService _purchaseOrderService;
- public ErpController(IBasicService basicService,IInvokeERPService invokeERPService)
+ public ErpController(IBasicService basicService,IInvokeERPService invokeERPService,IPurchaseOrderService purchaseOrderService)
{
_basicService = basicService;
_invokeERPService = invokeERPService;
+ _purchaseOrderService = purchaseOrderService;
}
/// <summary>
/// 娣诲姞浜屾湡鐗╂枡
/// </summary>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveMaterial"), AllowAnonymous]
+ [HttpPost, Route("ReceiveMaterial"), AllowAnonymous]
- public WebResponseContent ReceiveMaterial([FromBody] ERPRoot<ERPMaterialDTO> eRPMaterialDTO)
+ public WebResponseContent ReceiveMaterial([FromBody] ERPRoot<ERPMaterialDTO> eRPRoot)
{
- return _basicService.MaterielInfoService.ReceiveMaterial(eRPMaterialDTO.Content);
+ return _basicService.MaterielInfoService.ReceiveMaterial(eRPRoot.Content);
}
/// <summary>
/// 娣诲姞浜屾湡渚涘簲鍟�
/// </summary>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveSupplier"), AllowAnonymous]
+ [HttpPost, Route("ReceiveSupplier"), AllowAnonymous]
- public WebResponseContent ReceiveSupplier([FromBody] ERPRoot<ERPSupplierDTO> eRPSupplierDTO)
+ public WebResponseContent ReceiveSupplier([FromBody] ERPRoot<ERPSupplierDTO> eRPRoot)
{
- return _basicService.SupplierInfoService.ReceiveSupplier(eRPSupplierDTO.Content);
+ return _basicService.SupplierInfoService.ReceiveSupplier(eRPRoot.Content);
}
/// <summary>
/// 娣诲姞浜屾湡瀹㈡埛
/// </summary>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveCustomer"), AllowAnonymous]
+ [HttpPost, Route("ReceiveCustomer"), AllowAnonymous]
- public WebResponseContent ReceiveCustomer([FromBody] ERPRoot<ERPCustomerDTO> eRPSupplierDTO)
+ public WebResponseContent ReceiveCustomer([FromBody] ERPRoot<ERPCustomerDTO> eRPRoot)
{
- return _basicService.CustomerInfoService.ReceiveCustomer(eRPSupplierDTO.Content);
+ return _basicService.CustomerInfoService.ReceiveCustomer(eRPRoot.Content);
}
/// <summary>
/// 娣诲姞浜屾湡鍛樺伐
/// </summary>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveStaff"), AllowAnonymous]
+ [HttpPost, Route("ReceiveStaff"), AllowAnonymous]
- public WebResponseContent ReceiveStaff([FromBody] ERPRoot<ERPUserInfoDTO> eRPCustomerDTO)
+ public WebResponseContent ReceiveStaff([FromBody] ERPRoot<ERPUserInfoDTO> eRPRoot)
{
- return _basicService.UserInfoService.ReceiveStaff(eRPCustomerDTO.Content);
+ return _basicService.UserInfoService.ReceiveStaff(eRPRoot.Content);
+ }
+
+ /// <summary>
+ /// 娣诲姞浜屾湡閲囪喘鍏ュ簱淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("PurchaseInboundInfo"), AllowAnonymous]
+
+ public WebResponseContent PurchaseInboundInfo([FromBody] ERPRoot<ERPPurchaseOrderDTO> eRPRoot)
+ {
+ return _purchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
+ }
+ /// <summary>
+ /// 娣诲姞浜屾湡閲囪喘閫�璐т俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("PurchaseReturn"), AllowAnonymous]
+
+ public WebResponseContent PurchaseReturn([FromBody] ERPRoot<ERPReturnOrderDTO> eRPRoot)
+ {
+ return _purchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
+ }
+ /// <summary>
+ /// 娣诲姞浜屾湡閿�鍞嚭搴撲俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ProDeliveryOrder"), AllowAnonymous]
+
+ public WebResponseContent ProDeliveryOrder([FromBody] ERPRoot<ERPProDeliveryDTO> eRPRoot)
+ {
+ return _purchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
+ }
+
+ /// <summary>
+ /// 娣诲姞闈炵敓浜ч鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveOut"), AllowAnonymous]
+
+ public WebResponseContent ReceiveOut([FromBody] ERPRoot<ERPPickOutOrderDTO> eRPRoot)
+ {
+ return _purchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
+ }
+
+
+ /// <summary>
+ /// 娣诲姞閿�鍞��璐т俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ProDeliveryBack"), AllowAnonymous]
+
+ public WebResponseContent ProDeliveryBack([FromBody] ERPRoot<ERPProDeliverBackDTO> eRPRoot)
+ {
+ return _purchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
+ }
+
+ /// <summary>
+ /// 鎺ㄩ�侀噰璐俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ERPPurchaseUp"), AllowAnonymous]
+ public string ERPPurchaseUp([FromBody] ERPPurchaseUpModel eRPPurchaseUpModel)
+ {
+ return _invokeERPService.ERPPurchaseUp(eRPPurchaseUpModel);
+ }
+ /// <summary>
+ /// 鎺ㄩ�侀噰璐俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ERPProOutUp"), AllowAnonymous]
+ public string ERPProOutUp([FromBody] ERPProOutUpModel eRPProOutUpModel)
+ {
+ return _invokeERPService.ERPProOutUp(eRPProOutUpModel);
}
}
}
--
Gitblit v1.9.3