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 | 328 ++++++++++++++----------------------------------------
1 files changed, 87 insertions(+), 241 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 e67acf6..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,12 +15,8 @@
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
{
@@ -32,309 +28,159 @@
public class ErpController : ControllerBase
{
private readonly IBasicService _basicService;
- private readonly IOutboundService _outboundService;
- private readonly IInboundService _inboundService;
private readonly IInvokeERPService _invokeERPService;
- private readonly IReturnOrderService _returnOrderService;
+ private readonly IInboundService _inboundService;
- public ErpController(IBasicService basicService, IOutboundService outboundService, IInboundService inboundService,
- IInvokeERPService invokeERPService, IReturnOrderService returnOrderService)
+ public ErpController(IBasicService basicService,IInvokeERPService invokeERPService, IInboundService inboundService)
{
_basicService = basicService;
- _outboundService = outboundService;
- _inboundService = inboundService;
_invokeERPService = invokeERPService;
- _returnOrderService = returnOrderService;
+ _inboundService = inboundService;
+ }
+ /// <summary>
+ /// 娣诲姞浜屾湡鐗╂枡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveMaterial"), AllowAnonymous]
+
+ public WebResponseContent ReceiveMaterial([FromBody] ERPRoot<ERPMaterialDTO> eRPRoot)
+ {
+ return _basicService.MaterielInfoService.ReceiveMaterial(eRPRoot.Content);
}
/// <summary>
- /// 鎺ユ敹ERP閲囪喘鍗曚俊鎭�
+ /// 娣诲姞浜屾湡渚涘簲鍟�
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("ReceivePurchaseOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ReceivePurchaseOrder([FromBody] Root<PurchaseOrderModel> model)
+ [HttpPost, Route("ReceiveSupplier"), AllowAnonymous]
+
+ public WebResponseContent ReceiveSupplier([FromBody] ERPRoot<ERPSupplierDTO> eRPRoot)
{
- WebResponseContent content = _inboundService.PurchaseOrderService.ReceivePurchaseOrder(model.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _basicService.SupplierInfoService.ReceiveSupplier(eRPRoot.Content);
}
/// <summary>
- /// 鎺ユ敹ERP浠撳簱鍛樺伐鍜岃川妫�鍛樺伐鏁版嵁
+ /// 娣诲姞浜屾湡瀹㈡埛
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("ReceiveUser"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ReceiveUser([FromBody] Root<UserInfoDTO> model)
+ [HttpPost, Route("ReceiveCustomer"), AllowAnonymous]
+
+ public WebResponseContent ReceiveCustomer([FromBody] ERPRoot<ERPCustomerDTO> eRPRoot)
{
- WebResponseContent content = _basicService.UserInfoService.ReceiveUser(model.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _basicService.CustomerInfoService.ReceiveCustomer(eRPRoot.Content);
}
/// <summary>
- /// 鎺ユ敹ERP渚涘簲鍟嗕俊鎭�
+ /// 娣诲姞浜屾湡鍛樺伐
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("ReceiveSupplier"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ReceiveSupplier([FromBody] Root<SupplierDTO> model)
+ [HttpPost, Route("ReceiveStaff"), AllowAnonymous]
+
+ public WebResponseContent ReceiveStaff([FromBody] ERPRoot<ERPUserInfoDTO> eRPRoot)
{
- WebResponseContent content = _basicService.SupplierInfoService.ReceiveSupplier(model.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _basicService.UserInfoService.ReceiveStaff(eRPRoot.Content);
}
/// <summary>
- /// 鎺ユ敹ERP鐗╂枡淇℃伅
+ /// 娣诲姞浜屾湡閲囪喘鍏ュ簱淇℃伅
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("ReceiveMaterial"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ReceiveMaterial([FromBody] Root<MaterielInfoDTO> model)
+ [HttpPost, Route("PurchaseInboundInfo"), AllowAnonymous]
+
+ public WebResponseContent PurchaseInboundInfo([FromBody] ERPRoot<ERPPurchaseOrderDTO> eRPRoot)
{
- WebResponseContent content = _basicService.MaterielInfoService.ReceiveMaterial(model.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _inboundService.PurchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
+ }
+ /// <summary>
+ /// 娣诲姞浜屾湡閲囪喘閫�璐т俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("PurchaseReturn"), AllowAnonymous]
+
+ public WebResponseContent PurchaseReturn([FromBody] ERPRoot<ERPReturnOrderDTO> eRPRoot)
+ {
+ return _inboundService.PurchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
+ }
+ /// <summary>
+ /// 娣诲姞浜屾湡閿�鍞嚭搴撲俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ProDeliveryOrder"), AllowAnonymous]
+
+ public WebResponseContent ProDeliveryOrder([FromBody] ERPRoot<ERPProDeliveryDTO> eRPRoot)
+ {
+ return _inboundService.PurchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
}
/// <summary>
- /// 鎺ユ敹ERP瀹㈡埛淇℃伅
+ /// 娣诲姞闈炵敓浜ч鏂欎俊鎭�
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("ReceiveCustomer"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ReceiveCustomer([FromBody] Root<CustomerInfoDTO> model)
+ [HttpPost, Route("ReceiveOut"), AllowAnonymous]
+
+ public WebResponseContent ReceiveOut([FromBody] ERPRoot<ERPPickOutOrderDTO> eRPRoot)
{
- WebResponseContent content = _basicService.CustomerInfoService.ReceiveCustomer(model.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _inboundService.PurchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
}
/// <summary>
- /// 鎺ユ敹ERP鍑哄簱鍗曚俊鎭�
- /// </summary>
- /// <param name="erpOutOrder"></param>
- /// <returns></returns>
- [HttpPost, Route("ReceiveOutOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ReceiveOutOrder([FromBody] Root<ErpOutOrderDTO> erpOutOrder)
- {
- WebResponseContent content = _outboundService.OutboundOrderService.ReceiveOutOrder(erpOutOrder.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
- }
- /// <summary>
- /// 鎺ユ敹ERP鎴愬搧鍑哄簱鍗曚俊鎭�(璁㈠崟鍑哄簱/瀵勫敭鍑哄簱)
+ /// 娣诲姞闈為噰璐敓浜у叆搴撳崟淇℃伅
/// </summary>
/// <returns></returns>
- [HttpPost, Route("ProductDeliveryOrder"), AllowAnonymous, MethodParamsValidate]
- public async Task<ErpResponseContent> ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
+ [HttpPost, Route("ReceiveInbound"), AllowAnonymous]
+
+ public WebResponseContent ReceiveInbound([FromBody] ERPRoot<ERPInboundOrderDTO> eRPRoot)
{
- var content = await _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _inboundService.InboundOrderService.ReceiveInbound(eRPRoot.Content);
}
+
+
/// <summary>
- /// 鎴愬搧瀵勫敭杞叆/璋冩嫧鍏ュ簱
- /// </summary>
- /// <param name="root"></param>
- /// <returns></returns>
- [HttpPost, Route("ProductWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ProductWarehousingOrder([FromBody] Root<ErpProductWarehousingOrderDTO> root)
- {
- WebResponseContent content = _inboundService.ErpProInOrderService.ProductWarehousingOrder(root.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
- }
- /// <summary>
- /// 鎴愬搧璋冩嫧鍑猴紙鐮斿彂锛�
- /// </summary>
- /// <param name="root"></param>
- /// <returns></returns>
- [HttpPost, Route("ProductTransferOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrderDTO> root)
- {
- WebResponseContent content = _outboundService.ErpProTransferOrderService.ProductTransferOrder(root.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
- }
- /// <summary>
- /// 鎴愬搧鎶ュ簾鍑哄簱鍗曟帴鏀�
- /// </summary>
- /// <param name="root"></param>
- /// <returns></returns>
- [HttpPost, Route("ProductScrappedOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ProductScrappedOrder([FromBody] Root<ErpProductScrappedOrderDTO> root)
- {
- return Instance.OK();
- }
- /// <summary>
- /// 鎴愬搧棰嗘枡鍑哄簱鍗曟帴鏀�
- /// </summary>
- /// <param name="root"></param>
- /// <returns></returns>
- [HttpPost, Route("ProductOutOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ProductOutOrder([FromBody] Root<ErpProOutLingOrder> root)
- {
- return Instance.OK();
- }
- /// <summary>
- /// 閿�鍞寚娲惧崟鎺ユ敹
- /// </summary>
- [HttpPost, Route("ProductSpecifyVer"), AllowAnonymous, MethodParamsValidate]
- public async Task<ErpResponseContent> ProductSpecifyVerAsync([FromBody] Root<ErpProductSpecifyVerDTO> root)
- {
- var content = await _outboundService.ProOutOrderService.ProductSpecifyVer(root.Content);
- 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)
+ [HttpPost, Route("ProDeliveryBack"), AllowAnonymous]
+
+ public WebResponseContent ProDeliveryBack([FromBody] ERPRoot<ERPProDeliverBackDTO> eRPRoot)
{
- WebResponseContent content = _inboundService.InbounOrderService.ReceiveWarehousingOrder(model.Content);
- if (content.Status) return Instance.OK();
- else return Instance.Error(content.Message);
+ return _inboundService.PurchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
}
+
/// <summary>
- /// 鎺ㄩ�丒RP鍑哄簱
+ /// ERP涓婁紶閲囪喘淇℃伅
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
- public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
+ [HttpPost, Route("ERPPurchaseUp"), AllowAnonymous]
+ public string ERPPurchaseUp([FromBody] ERPPurchaseUpModel eRPPurchaseUpModel)
{
- return _invokeERPService.InvokeOutStandardsApi(issueModel);
+ return _invokeERPService.ERPPurchaseUp(eRPPurchaseUpModel);
}
/// <summary>
- /// 鎺ㄩ�丒RP鏀惰揣
+ /// ERP鎴愬搧閿�鍞嚭搴撲笂浼犱俊鎭�
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
- public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
+ [HttpPost, Route("ERPProOutUp"), AllowAnonymous]
+ public string ERPProOutUp([FromBody] ERPProOutUpModel eRPProOutUpModel)
{
- return _invokeERPService.InvokeMatReceiveApi(receiveModel);
+ return _invokeERPService.ERPProOutUp(eRPProOutUpModel);
}
/// <summary>
- /// 鎺ㄩ�丒RP鏉ユ枡IQC璐ㄦ
+ /// ERP涓婁紶鎴愬搧鍏ュ簱淇℃伅
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeCheckOrderApi"), AllowAnonymous]
- public string InvokeCheckOrderApi(ERPCheckModel checkModel)
+ [HttpPost, Route("ERPProInUp"), AllowAnonymous]
+ public string ERPProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
{
- return _invokeERPService.InvokeCheckOrderApi(checkModel);
+ return _invokeERPService.ERPProInUp(eRPProInUpModel);
}
/// <summary>
- /// 鎺ㄩ�丒RP鍏ュ簱
+ /// ERP涓婁紶鍗�-鎴愬搧鍏ュ簱淇℃伅
/// </summary>
/// <returns></returns>
- [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
- public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
+ [HttpPost, Route("ERPSemiProInUp"), AllowAnonymous]
+ public string ERPSemiProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
{
- 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);
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeProInApi"), AllowAnonymous]
- public string InvokeProInApi([FromBody] ERPProInboundModel inboundModel)
- {
- return _invokeERPService.InvokeProInApi(inboundModel);
- }
- /// <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)
- {
- return _invokeERPService.InvokeProSaleCustomer(saleOrder);
- }
- /// <summary>
- /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeOutProErpSync"), AllowAnonymous]
- public string InvokeOutProErpSync(string outProOrderNo)
- {
- return _invokeERPService.InvokeOutProErpSync(outProOrderNo);
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeProInErpStatic"), AllowAnonymous]
- public string InvokeProInErpStatic(string partNum, string partNumWithRev)
- {
- return _invokeERPService.InvokeProInErpStatic(partNum, partNumWithRev);
+ return _invokeERPService.ERPSemiProInUp(eRPProInUpModel);
}
}
}
--
Gitblit v1.9.3