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/ErpBSTController.cs | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
index a723b67..52cb90e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
@@ -17,8 +17,9 @@
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundService;
+using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
-using static WIDESEA_DTO.ErpResponseContent;
+using WIDESEA_OutboundService;
namespace WIDESEA_WMSServer.Controllers.ERP
{
@@ -33,13 +34,19 @@
private readonly IInvokeERPService _invokeERPService;
private readonly IPurchaseBSTOrderService _purchaseBSTOrderService;
private readonly IOutBSTOrderService _outBSTOrderService;
+ private readonly IReturnBSTOrderService _returnBSTOrderService;
+ private readonly IOutboundService _outboundService;
+ private readonly ITaskService _taskService;
- public ErpBSTController(IBasicService basicService, IInvokeERPService invokeERPService,IPurchaseBSTOrderService purchaseBSTOrderService,IOutBSTOrderService outBSTOrderService)
+ public ErpBSTController(IBasicService basicService, IInvokeERPService invokeERPService,IPurchaseBSTOrderService purchaseBSTOrderService,IOutBSTOrderService outBSTOrderService,IReturnBSTOrderService returnBSTOrderService, IOutboundService outboundService, ITaskService taskService)
{
_basicService = basicService;
_invokeERPService = invokeERPService;
_purchaseBSTOrderService = purchaseBSTOrderService;
_outBSTOrderService = outBSTOrderService;
+ _returnBSTOrderService = returnBSTOrderService;
+ _outboundService = outboundService;
+ _taskService = taskService;
}
/// <summary>
/// 娣诲姞鑰佸巶鐗╂枡
@@ -53,7 +60,7 @@
}
/// <summary>
- /// 娣诲姞鑰佸巶渚涘簲鍟嗕俊鎭�
+ /// 鎺ユ敹鑰佸巶渚涘簲鍟嗕俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceiveSupplier"), AllowAnonymous]
@@ -64,7 +71,7 @@
}
/// <summary>
- /// 娣诲姞鑰佸巶閲囪喘鍗曚俊鎭�
+ /// 鎺ユ敹鑰佸巶閲囪喘鍗曚俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceivePurchaseOrder"), AllowAnonymous]
@@ -72,15 +79,54 @@
{
return _purchaseBSTOrderService.AddPurchaseBSTOrder(bSTPurchaseOrderDTOs);
}
-
/// <summary>
- /// 娣诲姞鍑哄簱鎺掔▼淇℃伅
+ /// 鎺ユ敹涓�鏈熺敓绠℃帓绋嬩俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceiveOutOrder"), AllowAnonymous]
- public WebResponseContent AddOutBSTOrder([FromBody] List<BSTOutOrderDTO> bSTOutOrderDTOs)
+ public WebResponseContent AddOutSGOrder([FromBody] List<SGOutOrderDTO> outOrderDTOs)
{
- return _outBSTOrderService.AddOutBSTOrder(bSTOutOrderDTOs);
+ return _taskService.AddOutSGOrder(outOrderDTOs);
+ }
+
+ /// <summary>
+ /// 鎺ユ敹鍗氭�濋�氶鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceivePicking"), AllowAnonymous]
+ public WebResponseContent ReceivePicking(BSTPickInfoDTO bSTPickInfoDTO)
+ {
+ return _taskService.ReceivePicking(bSTPickInfoDTO);
+ }
+
+ /// <summary>
+ /// 鎺ユ敹鍗氭�濋�氶��鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveReturnOrder"), AllowAnonymous]
+ public WebResponseContent ReceiveReturnOrder([FromBody] List<BSTReturnOrderDTO> bSTReturnOrderDTOs)
+ {
+ return _returnBSTOrderService.ReceiveReturnOrder(bSTReturnOrderDTOs);
+ }
+
+ /// <summary>
+ /// 鎺ユ敹鍗氭�濋�氱洏鐐逛俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveStockCheckOrder"), AllowAnonymous]
+ public WebResponseContent ReceiveStockCheckOrder([FromBody] List<BSTOutOrderDTO> bSTOutOrderDTOs)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板簱瀛�") ;
+ }
+
+ /// <summary>
+ /// 璋冪敤鍗氭�濋�欵RP搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("BSTStockAsync"), AllowAnonymous]
+ public string BSTStockAsync(string barCode)
+ {
+ return _invokeERPService.BSTStockAsync(barCode);
}
}
}
--
Gitblit v1.9.3