From 9ae0890dd74771ba9edd44d4830e0de37f8d9938 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 26 九月 2025 16:55:03 +0800
Subject: [PATCH] MES接口优化，老厂排程优化等
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 153 +++++++++++++++------------------------------------
1 files changed, 45 insertions(+), 108 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 7e7102d..9533314 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"
@@ -4,16 +4,17 @@
using WIDESEA_Core;
using WIDESEA_DTO;
using WIDESEA_IBasicService;
-using WIDESEA_IInboundRepository;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
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;
+using WIDESEA_IInboundService;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -24,138 +25,74 @@
[ApiController]
public class MesController : ControllerBase
{
- private readonly IOutboundService _outboundService;
private readonly ITaskService _taskService;
+ private readonly IOutMESOrderService _outMESOrderService;
+ private readonly IMESProInOrderInfoService _proInOrderInfoService;
- public MesController(IOutboundService outboundService, ITaskService taskService)
+ public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService,IMESProInOrderInfoService proInOrderInfoService)
{
- _outboundService = outboundService;
_taskService = taskService;
+ _outMESOrderService = outMESOrderService;
+ _proInOrderInfoService=proInOrderInfoService;
+ }
+ /// <summary>
+ /// 鎺ユ敹MES棰嗘枡璁″垝
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveOutBound"), AllowAnonymous]
+
+ public WebResponseContent ReceiveOutBound([FromBody] List<OutMESOrderDTO> outMESOrderDTOs)
+ {
+ return _outMESOrderService.ReceiveOutBound(outMESOrderDTOs);
+ }
+ /// <summary>
+ /// MES鑷姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [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)
+ [HttpPost, HttpGet, Route("ReceiveManualIssue"), AllowAnonymous]
+ public WebResponseContent ReceiveManualIssue([FromBody] MESManualIssueDTO manualIssueDTO)
{
- return _taskService.TestToolOut(model.Content);
+ return _taskService.ReceiveManualIssue(manualIssueDTO);
}
/// <summary>
- /// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
+ /// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("TestToolBack"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent TestToolBack([FromBody] Root<TestToolBackModel> model)
+ [HttpPost, HttpGet, Route("ReceiveReturnIssue"), AllowAnonymous]
+ public WebResponseContent ReceiveReturnIssue([FromBody] List<MESReturnIssueDTO> returnIssueDTOs)
{
- return _taskService.TestToolBack(model.Content);
+ return _taskService.ReceiveReturnIssue(returnIssueDTOs);
}
/// <summary>
- /// 娴嬭瘯鏋舵姤搴�
+ /// 鎴愬搧/鍗婃垚鍝佷俊鎭悓姝ユ帴鍙�
/// </summary>
- /// <param name="model"></param>
/// <returns></returns>
- [HttpPost, Route("TestToolScrap"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent TestScrap([FromBody] Root<TestToolScrap> model)
+ [HttpPost, HttpGet, Route("ReceiveProCodeInfo"), AllowAnonymous]
+ public WebResponseContent ReceiveProCodeInfo([FromBody] List<MESProInDTO> proInDTOs)
{
- return _taskService.TestScrap(model.Content);
+ return _proInOrderInfoService.ReceiveProCodeInfo(proInDTOs);
}
/// <summary>
- ///
- /// </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("SubstrateOut"), AllowAnonymous]
- public MesResponseContent SubstrateOut([FromBody] Root<SubstrateOutModel> model)
- {
- return _taskService.SubstrateOut(model.Content);
- }
-
- /// <summary>
- /// 鍩烘澘浣欐枡閫�搴�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("SubstrateBack"), AllowAnonymous]
- public MesResponseContent SubstrateBack([FromBody] Root<SubstrateBackModel> model)
- {
- 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>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("BagInfoSync"), AllowAnonymous]
- public MesResponseContent BagInfoSync([FromBody] Root<MesBagInfoModel> model)
- {
- return _taskService.BagInfoSync(model.Content);
- }
- /// <summary>
- /// MES鎴愬搧澶栧寘淇℃伅鎺ユ敹
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("BoxStockin"), AllowAnonymous]
- public MesResponseContent BoxStockin([FromBody] Root<MesBoxInfoModel> model)
- {
- return _taskService.BoxStockin(model.Content);
- }
- /// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
+ /// MES宸ュ崟鍋滄鎺ュ彛
/// </summary>
/// <returns></returns>
- [HttpPost, Route("ShipmentOrderSync"), AllowAnonymous]
- public WebResponseContent ShipmentOrderSync([FromBody] MesShipmentOrderSync model)
+ [HttpPost, HttpGet, Route("ReceiveProOrderStop"), AllowAnonymous]
+ public WebResponseContent ReceiveProOrderStop([FromBody] MESOrderStopDTO orderStopDTO)
{
- return _taskService.ShipmentOrderSync(model);
- }
- /// <summary>
- /// 鎴愬搧杩斿伐鎻愬簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost,Route("RworkTask"),AllowAnonymous]
- public MesResponseContent RworkTask([FromBody] Root<RworkTaskModel> model)
- {
- return _taskService.RworkTask(model.Content);
- }
- /// <summary>
- /// 搴撳瓨鏉垮嚭搴撳悓姝ユ帴鍙�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("ProductOutBoundSync"), AllowAnonymous]
- public WebResponseContent ProductOutBoundSync([FromBody] MesProductOutBound model)
- {
- return _outboundService.RworkOutboundOrderService.ProductOutBoundSync(model);
+ return _proInOrderInfoService.ReceiveProOrderStop(orderStopDTO);
}
}
}
--
Gitblit v1.9.3