From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新，WCS代码优化，出入库分配优化
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 197 +++++++++++++++++++++++++++----------------------
1 files changed, 109 insertions(+), 88 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 9e7b0fb..72de6a0 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,137 +29,158 @@
{
private readonly IBasicService _basicService;
private readonly IInvokeERPService _invokeERPService;
+ private readonly IInboundService _inboundService;
- public ErpController(IBasicService basicService,IInvokeERPService invokeERPService)
+ public ErpController(IBasicService basicService,IInvokeERPService invokeERPService, IInboundService inboundService)
{
_basicService = basicService;
_invokeERPService = invokeERPService;
+ _inboundService = inboundService;
}
/// <summary>
- /// 鎺ㄩ�丒RP鍑哄簱
+ /// 娣诲姞浜屾湡鐗╂枡
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
- public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
+ [HttpPost, Route("ReceiveMaterial"), AllowAnonymous]
+
+ public WebResponseContent ReceiveMaterial([FromBody] ERPRoot<ERPMaterialDTO> eRPRoot)
{
- return _invokeERPService.InvokeOutStandardsApi(issueModel);
+ return _basicService.MaterielInfoService.ReceiveMaterial(eRPRoot.Content);
}
+
/// <summary>
- /// 鎺ㄩ�丒RP鏀惰揣
+ /// 娣诲姞浜屾湡渚涘簲鍟�
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
- public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
+ [HttpPost, Route("ReceiveSupplier"), AllowAnonymous]
+
+ public WebResponseContent ReceiveSupplier([FromBody] ERPRoot<ERPSupplierDTO> eRPRoot)
{
- return _invokeERPService.InvokeMatReceiveApi(receiveModel);
+ return _basicService.SupplierInfoService.ReceiveSupplier(eRPRoot.Content);
}
+
/// <summary>
- /// 鎺ㄩ�丒RP鏉ユ枡IQC璐ㄦ
+ /// 娣诲姞浜屾湡瀹㈡埛
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeCheckOrderApi"), AllowAnonymous]
- public string InvokeCheckOrderApi(ERPCheckModel checkModel)
+ [HttpPost, Route("ReceiveCustomer"), AllowAnonymous]
+
+ public WebResponseContent ReceiveCustomer([FromBody] ERPRoot<ERPCustomerDTO> eRPRoot)
{
- return _invokeERPService.InvokeCheckOrderApi(checkModel);
+ return _basicService.CustomerInfoService.ReceiveCustomer(eRPRoot.Content);
}
+
/// <summary>
- /// 鎺ㄩ�丒RP鍏ュ簱
+ /// 娣诲姞浜屾湡鍛樺伐
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
- public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
+ [HttpPost, Route("ReceiveStaff"), AllowAnonymous]
+
+ public WebResponseContent ReceiveStaff([FromBody] ERPRoot<ERPUserInfoDTO> eRPRoot)
{
- return _invokeERPService.InvokeInboundOrderApi(inboundModel);
+ return _basicService.UserInfoService.ReceiveStaff(eRPRoot.Content);
}
+
/// <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);
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱涓婃姤鎺ュ彛璋冪敤
+ /// 娣诲姞浜屾湡閲囪喘鍏ュ簱淇℃伅
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeProInApi"), AllowAnonymous]
- public string InvokeProInApi([FromBody] ERPProInboundModel inboundModel)
+ [HttpPost, Route("PurchaseInboundInfo"), AllowAnonymous]
+
+ public WebResponseContent PurchaseInboundInfo([FromBody] ERPRoot<ERPPurchaseOrderDTO> eRPRoot)
{
- return _invokeERPService.InvokeProInApi(inboundModel);
+ return _inboundService.PurchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
}
/// <summary>
- /// ERP鎴愬搧鍑哄簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- [HttpPost, Route("InvokeProOutApi"), AllowAnonymous]
- public string InvokeProOutApi([FromBody] ERPProOutOrderModel outOrderModel)
- {
- return _invokeERPService.InvokeProOutApi(outOrderModel);
- }
- /// <summary>
- /// 鎴愬搧浠撴鎶ュ簾鍑哄簱鎺ㄩ�丒RP
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- [HttpPost, Route("InvokeProCheckApi"), AllowAnonymous]
- public string InvokeProCheckApi([FromBody] ERPProductCheckModel checkModel)
- {
- return _invokeERPService.InvokeProCheckApi(checkModel);
- }
- /// <summary>
- /// 鎴愬搧瓒呭懆鏈熸姤搴熸帹閫丒Rp
- /// </summary>
- /// <param name="sheetModel"></param>
- /// <returns></returns>
- [HttpPost, Route("InvokeProScrapSheetApi"), AllowAnonymous]
- public string InvokeProScrapSheetApi([FromBody] ERPScrapSheetModel sheetModel)
- {
- return _invokeERPService.InvokeProScrapSheetApi(sheetModel);
- }
- /// <summary>
- /// 鎴愬搧鐩樼偣鐩樿耽/鐩樹簭
- /// </summary>
- /// <param name="stockCheckModel"></param>
- /// <returns></returns>
- [HttpPost, Route("InvokeProStockCheckApi"), AllowAnonymous]
- public string InvokeProStockCheckApi([FromBody] ERPProStockCheckModel stockCheckModel)
- {
- return _invokeERPService.InvokeProStockCheckApi(stockCheckModel);
- }
- /// <summary>
- /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
+ /// 娣诲姞浜屾湡閲囪喘閫�璐т俊鎭�
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeProSaleCustomer"), AllowAnonymous]
- public string InvokeProSaleCustomer(string saleOrder)
+ [HttpPost, Route("PurchaseReturn"), AllowAnonymous]
+
+ public WebResponseContent PurchaseReturn([FromBody] ERPRoot<ERPReturnOrderDTO> eRPRoot)
{
- return _invokeERPService.InvokeProSaleCustomer(saleOrder);
+ return _inboundService.PurchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
}
/// <summary>
- /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
+ /// 娣诲姞浜屾湡閿�鍞嚭搴撲俊鎭�
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeOutProErpSync"), AllowAnonymous]
- public string InvokeOutProErpSync(string outProOrderNo)
+ [HttpPost, Route("ProDeliveryOrder"), AllowAnonymous]
+
+ public WebResponseContent ProDeliveryOrder([FromBody] ERPRoot<ERPProDeliveryDTO> eRPRoot)
{
- return _invokeERPService.InvokeOutProErpSync(outProOrderNo);
+ return _inboundService.PurchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
+ }
+
+ /// <summary>
+ /// 娣诲姞闈炵敓浜ч鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveOut"), AllowAnonymous]
+
+ public WebResponseContent ReceiveOut([FromBody] ERPRoot<ERPPickOutOrderDTO> eRPRoot)
+ {
+ return _inboundService.PurchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
+ }
+
+ /// <summary>
+ /// 娣诲姞闈為噰璐敓浜у叆搴撳崟淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveInbound"), AllowAnonymous]
+
+ public WebResponseContent ReceiveInbound([FromBody] ERPRoot<ERPInboundOrderDTO> eRPRoot)
+ {
+ return _inboundService.InboundOrderService.ReceiveInbound(eRPRoot.Content);
+ }
+
+
+ /// <summary>
+ /// 娣诲姞閿�鍞��璐т俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ProDeliveryBack"), AllowAnonymous]
+
+ public WebResponseContent ProDeliveryBack([FromBody] ERPRoot<ERPProDeliverBackDTO> eRPRoot)
+ {
+ return _inboundService.PurchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
+ }
+
+ /// <summary>
+ /// ERP涓婁紶閲囪喘淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ERPPurchaseUp"), AllowAnonymous]
+ public string ERPPurchaseUp([FromBody] ERPPurchaseUpModel eRPPurchaseUpModel)
+ {
+ return _invokeERPService.ERPPurchaseUp(eRPPurchaseUpModel);
}
/// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
+ /// ERP鎴愬搧閿�鍞嚭搴撲笂浼犱俊鎭�
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeProInErpStatic"), AllowAnonymous]
- public string InvokeProInErpStatic(string partNum, string partNumWithRev)
+ [HttpPost, Route("ERPProOutUp"), AllowAnonymous]
+ public string ERPProOutUp([FromBody] ERPProOutUpModel eRPProOutUpModel)
{
- return _invokeERPService.InvokeProInErpStatic(partNum, partNumWithRev);
+ return _invokeERPService.ERPProOutUp(eRPProOutUpModel);
+ }
+ /// <summary>
+ /// ERP涓婁紶鎴愬搧鍏ュ簱淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ERPProInUp"), AllowAnonymous]
+ public string ERPProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
+ {
+ return _invokeERPService.ERPProInUp(eRPProInUpModel);
+ }
+ /// <summary>
+ /// ERP涓婁紶鍗�-鎴愬搧鍏ュ簱淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ERPSemiProInUp"), AllowAnonymous]
+ public string ERPSemiProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
+ {
+ return _invokeERPService.ERPSemiProInUp(eRPProInUpModel);
}
}
}
--
Gitblit v1.9.3