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/ErpBSTController.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 da8da61..1ed4f5b 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
{
@@ -34,14 +35,18 @@
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,IReturnBSTOrderService returnBSTOrderService)
+ 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>
/// 娣诲姞鑰佸巶鐗╂枡
@@ -75,15 +80,25 @@
return _purchaseBSTOrderService.AddPurchaseBSTOrder(bSTPurchaseOrderDTOs);
}
+ ///// <summary>
+ ///// 鎺ユ敹鍑哄簱鎺掔▼淇℃伅
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("ReceiveOutOrder"), AllowAnonymous]
+ //public WebResponseContent AddOutBSTOrder([FromBody] List<BSTOutOrderDTO> bSTOutOrderDTOs)
+ //{
+ // return _outBSTOrderService.AddOutBSTOrder(bSTOutOrderDTOs);
+ //}
/// <summary>
- /// 鎺ユ敹鍑哄簱鎺掔▼淇℃伅
+ /// 鎺ユ敹涓�鏈熺敓绠℃帓绋嬩俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceiveOutOrder"), AllowAnonymous]
- public WebResponseContent AddOutBSTOrder([FromBody] List<BSTOutOrderDTO> bSTOutOrderDTOs)
+ public WebResponseContent AddOutBSTOrder([FromBody] List<SGOutOrderDTO> outOrderDTOs)
{
- return _outBSTOrderService.AddOutBSTOrder(bSTOutOrderDTOs);
+ return _taskService.AddOutSGOrder(outOrderDTOs);
}
+
/// <summary>
/// 鎺ユ敹鍗氭�濋�氶鏂欎俊鎭�
/// </summary>
@@ -93,6 +108,7 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�") ;
}
+
/// <summary>
/// 鎺ユ敹鍗氭�濋�氶��鏂欎俊鎭�
/// </summary>
@@ -102,6 +118,7 @@
{
return _returnBSTOrderService.ReceiveReturnOrder(bSTReturnOrderDTOs);
}
+
/// <summary>
/// 鎺ユ敹鍗氭�濋�氱洏鐐逛俊鎭�
/// </summary>
@@ -111,5 +128,15 @@
{
return _outBSTOrderService.AddOutBSTOrder(bSTOutOrderDTOs);
}
+
+ /// <summary>
+ /// 璋冪敤鍗氭�濋�欵RP搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("BSTStockAsync"), AllowAnonymous]
+ public string BSTStockAsync(string barCode)
+ {
+ return _invokeERPService.BSTStockAsync(barCode);
+ }
}
}
--
Gitblit v1.9.3