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/MES/MesController.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 9533314..80b269d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -15,6 +15,8 @@
using WIDESEA_DTO.MES;
using WIDESEA_IOutboundService;
using WIDESEA_IInboundService;
+using WIDESEA_External.MESService;
+using WIDESEA_External.Model;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -28,12 +30,14 @@
private readonly ITaskService _taskService;
private readonly IOutMESOrderService _outMESOrderService;
private readonly IMESProInOrderInfoService _proInOrderInfoService;
+ private readonly IInvokeMESService _invokeMESService;
- public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService,IMESProInOrderInfoService proInOrderInfoService)
+ public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService,IMESProInOrderInfoService proInOrderInfoService, IInvokeMESService invokeMESService)
{
_taskService = taskService;
_outMESOrderService = outMESOrderService;
_proInOrderInfoService=proInOrderInfoService;
+ _invokeMESService = invokeMESService;
}
/// <summary>
/// 鎺ユ敹MES棰嗘枡璁″垝
@@ -43,7 +47,7 @@
public WebResponseContent ReceiveOutBound([FromBody] List<OutMESOrderDTO> outMESOrderDTOs)
{
- return _outMESOrderService.ReceiveOutBound(outMESOrderDTOs);
+ return _taskService.ReceiveOutBound(outMESOrderDTOs);
}
/// <summary>
/// MES鑷姩鍙枡鎺ュ彛
@@ -82,7 +86,7 @@
[HttpPost, HttpGet, Route("ReceiveProCodeInfo"), AllowAnonymous]
public WebResponseContent ReceiveProCodeInfo([FromBody] List<MESProInDTO> proInDTOs)
{
- return _proInOrderInfoService.ReceiveProCodeInfo(proInDTOs);
+ return _taskService.ReceiveProCodeInfo(proInDTOs);
}
/// <summary>
@@ -94,5 +98,55 @@
{
return _proInOrderInfoService.ReceiveProOrderStop(orderStopDTO);
}
+
+ /// <summary>
+ /// MES閰嶉�佸嚭鍙戦�氱煡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("MESDispatchUp"), AllowAnonymous]
+ public string MESDispatchUp([FromBody] MESDispatchModel mESDispatchModel)
+ {
+ return _invokeMESService.MESDispatchUp(mESDispatchModel);
+ }
+ /// <summary>
+ /// MES閰嶉�佸埌杈鹃�氱煡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("MESDelivery"), AllowAnonymous]
+ public string MESDelivery([FromBody] MESDeliveryModel mESDeliveryModel)
+ {
+ return _invokeMESService.MESDelivery(mESDeliveryModel);
+ }
+
+ /// <summary>
+ /// MES閫�鏂欑┖鎵樻帴鏀堕�氱煡
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("MESRecepNotice"), AllowAnonymous]
+ public string MESRecepNotice([FromBody] MESRecepNoticeModel mESRecepNoticeModel)
+ {
+ return _invokeMESService.MESRecepNotice(mESRecepNoticeModel);
+ }
+
+ /// <summary>
+ /// MES灏忚溅鍒拌揪閫氱煡
+ /// </summary>
+ /// <param name="mESAvgArriveNoticeModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("MESAvgArriveNotice"), AllowAnonymous]
+ public string MESAvgArriveNotice([FromBody] MESAvgArriveNoticeModel mESAvgArriveNoticeModel)
+ {
+ return _invokeMESService.MESAvgArriveNotice(mESAvgArriveNoticeModel);
+ }
+ /// <summary>
+ /// MES浜ч噺鍥炰紶
+ /// </summary>
+ /// <param name="boxCode"></param>
+ /// <returns></returns>
+ [HttpPost, Route("MESBoxCodeNotice"), AllowAnonymous]
+ public string MESBoxCodeNotice(string boxCode)
+ {
+ return _invokeMESService.MESBoxCodeNotice(boxCode);
+ }
}
}
--
Gitblit v1.9.3