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/MES/MesController.cs | 84 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 16 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 9f70627..9a43bd8 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"
@@ -14,6 +14,9 @@
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.MES;
using WIDESEA_IOutboundService;
+using WIDESEA_IInboundService;
+using WIDESEA_External.MESService;
+using WIDESEA_External.Model;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -26,11 +29,15 @@
{
private readonly ITaskService _taskService;
private readonly IOutMESOrderService _outMESOrderService;
+ private readonly IMESProInOrderInfoService _proInOrderInfoService;
+ private readonly IInvokeMESService _invokeMESService;
- public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService)
+ public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService,IMESProInOrderInfoService proInOrderInfoService, IInvokeMESService invokeMESService)
{
_taskService = taskService;
_outMESOrderService = outMESOrderService;
+ _proInOrderInfoService=proInOrderInfoService;
+ _invokeMESService = invokeMESService;
}
/// <summary>
/// 鎺ユ敹MES棰嗘枡璁″垝
@@ -38,15 +45,14 @@
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceiveOutBound"), AllowAnonymous]
- public WebResponseContent ReceiveOutBound([FromBody] OutMESOrderDTO outMESOrderDTO)
+ public WebResponseContent ReceiveOutBound([FromBody] List<OutMESOrderDTO> outMESOrderDTOs)
{
- return _outMESOrderService.ReceiveOutBound(outMESOrderDTO);
+ return _taskService.ReceiveOutBound(outMESOrderDTOs);
}
/// <summary>
/// MES鑷姩鍙枡鎺ュ彛
/// </summary>
/// <returns></returns>
- /// <summary>
[HttpPost, HttpGet, Route("ReceiveAutoIssue"), AllowAnonymous]
public WebResponseContent ReceiveAutoIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
{
@@ -57,44 +63,90 @@
/// MES鎵嬪姩鍙枡鎺ュ彛
/// </summary>
/// <returns></returns>
- /// <summary>
[HttpPost, HttpGet, Route("ReceiveManualIssue"), AllowAnonymous]
- public WebResponseContent ReceiveManualIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
+ public WebResponseContent ReceiveManualIssue([FromBody] MESManualIssueDTO manualIssueDTO)
{
- return _taskService.ReceiveAutoIssue(autoIssueDTO);
+ return _taskService.ReceiveManualIssue(manualIssueDTO);
}
/// <summary>
/// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
/// </summary>
/// <returns></returns>
- /// <summary>
[HttpPost, HttpGet, Route("ReceiveReturnIssue"), AllowAnonymous]
- public WebResponseContent ReceiveReturnIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
+ public WebResponseContent ReceiveReturnIssue([FromBody] List<MESReturnIssueDTO> returnIssueDTOs)
{
- return _taskService.ReceiveAutoIssue(autoIssueDTO);
+ return _taskService.ReceiveReturnIssue(returnIssueDTOs);
}
/// <summary>
/// 鎴愬搧/鍗婃垚鍝佷俊鎭悓姝ユ帴鍙�
/// </summary>
/// <returns></returns>
- /// <summary>
[HttpPost, HttpGet, Route("ReceiveProCodeInfo"), AllowAnonymous]
- public WebResponseContent ReceiveProCodeInfo([FromBody] MESAutoIssueDTO autoIssueDTO)
+ public WebResponseContent ReceiveProCodeInfo([FromBody] List<MESProInDTO> proInDTOs)
{
- return _taskService.ReceiveAutoIssue(autoIssueDTO);
+ return _taskService.ReceiveProCodeInfo(proInDTOs);
}
/// <summary>
/// MES宸ュ崟鍋滄鎺ュ彛
/// </summary>
/// <returns></returns>
- /// <summary>
[HttpPost, HttpGet, Route("ReceiveProOrderStop"), AllowAnonymous]
- public WebResponseContent ReceiveProOrderStop([FromBody] MESAutoIssueDTO autoIssueDTO)
+ public WebResponseContent ReceiveProOrderStop([FromBody] MESOrderStopDTO orderStopDTO)
{
- return _taskService.ReceiveAutoIssue(autoIssueDTO);
+ 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,HttpGet, Route("MESBoxCodeNotice"), AllowAnonymous]
+ public string MESBoxCodeNotice(string boxCode)
+ {
+ return _invokeMESService.MESBoxCodeNotice(boxCode);
}
}
}
--
Gitblit v1.9.3