From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 20 九月 2025 15:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 98 +++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 52 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 0439ef8..9f70627 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"
@@ -7,10 +7,13 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_TaskInfoService;
using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
using WIDESEA_Core.Helper;
using Autofac.Core;
using WIDESEA_DTO.Stock;
+using WIDESEA_BasicService;
+using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.MES;
+using WIDESEA_IOutboundService;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -22,85 +25,76 @@
public class MesController : ControllerBase
{
private readonly ITaskService _taskService;
+ private readonly IOutMESOrderService _outMESOrderService;
- public MesController(ITaskService taskService)
+ public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService)
{
_taskService = taskService;
+ _outMESOrderService = outMESOrderService;
+ }
+ /// <summary>
+ /// 鎺ユ敹MES棰嗘枡璁″垝
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveOutBound"), AllowAnonymous]
+
+ public WebResponseContent ReceiveOutBound([FromBody] OutMESOrderDTO outMESOrderDTO)
+ {
+ return _outMESOrderService.ReceiveOutBound(outMESOrderDTO);
+ }
+ /// <summary>
+ /// MES鑷姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ /// <summary>
+ [HttpPost, HttpGet, Route("ReceiveAutoIssue"), AllowAnonymous]
+ public WebResponseContent ReceiveAutoIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
+ {
+ return _taskService.ReceiveAutoIssue(autoIssueDTO);
}
/// <summary>
- /// 鎺ユ敹MES娴嬭瘯鏋跺嚭搴�
+ /// MES鎵嬪姩鍙枡鎺ュ彛
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
+ /// <summary>
+ [HttpPost, HttpGet, Route("ReceiveManualIssue"), AllowAnonymous]
+ public WebResponseContent ReceiveManualIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
{
- return _taskService.TestToolOut(model.Content);
+ return _taskService.ReceiveAutoIssue(autoIssueDTO);
}
/// <summary>
- /// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
+ /// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("TestToolBack"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent TestToolBack([FromBody] Root<TestToolBackModel> model)
+ /// <summary>
+ [HttpPost, HttpGet, Route("ReceiveReturnIssue"), AllowAnonymous]
+ public WebResponseContent ReceiveReturnIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
{
- return _taskService.TestToolBack(model.Content);
+ return _taskService.ReceiveAutoIssue(autoIssueDTO);
}
/// <summary>
- /// 娴嬭瘯鏋舵姤搴�
+ /// 鎴愬搧/鍗婃垚鍝佷俊鎭悓姝ユ帴鍙�
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("TestToolScrap"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent TestScrap([FromBody] Root<TestToolScrap> model)
+ /// <summary>
+ [HttpPost, HttpGet, Route("ReceiveProCodeInfo"), AllowAnonymous]
+ public WebResponseContent ReceiveProCodeInfo([FromBody] MESAutoIssueDTO autoIssueDTO)
{
- return _taskService.TestScrap(model.Content);
+ return _taskService.ReceiveAutoIssue(autoIssueDTO);
}
/// <summary>
- ///
+ /// MES宸ュ崟鍋滄鎺ュ彛
/// </summary>
- /// <param name="toolSynInfo"></param>
/// <returns></returns>
- [HttpPost, Route("TestSynStock"), AllowAnonymous]
- public WebResponseContent TestSynStock([FromBody] TestToolSynInfo toolSynInfo)
- {
- return _taskService.TestSynStock(toolSynInfo);
- }
-
/// <summary>
- /// 鍩烘澘浣欐枡閫�搴�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("SubstrateBack"), AllowAnonymous]
- public MesResponseContent SubstrateBack([FromBody] Root<SubstrateBackModel> model)
+ [HttpPost, HttpGet, Route("ReceiveProOrderStop"), AllowAnonymous]
+ public WebResponseContent ReceiveProOrderStop([FromBody] MESAutoIssueDTO autoIssueDTO)
{
- return _taskService.SubstrateBack(model.Content);
- }
- /// <summary>
- /// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("UploadMesMaterialLotaAcept"), AllowAnonymous]
- public WebResponseContent UploadMesMaterialLotaAcept([FromBody] MesMaterialLotaAceptModel model)
- {
- return _taskService.UploadMesMaterialLotaAcept(model);
- }
-
- /// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ShipmentOrderSync"), AllowAnonymous]
- public WebResponseContent ShipmentOrderSync([FromBody] MesShipmentOrderSync model)
- {
- return _taskService.ShipmentOrderSync(model);
+ return _taskService.ReceiveAutoIssue(autoIssueDTO);
}
}
}
--
Gitblit v1.9.3