From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:20:26 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 12 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 2ba94bd..cebe431 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -10,27 +10,24 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_TaskInfoService;
using WIDESEA_DTO.ERP;
+using WIDESEA_DTO.MES;
+using WIDESEA_Core.Helper;
namespace WIDESEA_WMSServer.Controllers.MES
{
+ /// <summary>
+ /// MES鎺ュ彛
+ /// </summary>
[Route("api/Mes")]
[ApiController]
public class MesController : ControllerBase
{
- private readonly IPurchaseOrderRepository _purchaseOrderRepository;
- private readonly IPurchaseOrderService _purchaseOrderService;
- private readonly ISupplierInfoService _supplierInfoService;
- private readonly IMaterielInfoService _materielInfoService;
- private readonly IOutboundOrderService _outboundOrderService;
+ private readonly IOutboundService _outboundService;
private readonly ITaskService _taskService;
- public MesController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService,ITaskService taskService)
+ public MesController(IOutboundService outboundService, ITaskService taskService)
{
- _purchaseOrderRepository = purchaseOrderRepository;
- _purchaseOrderService = purchaseOrderService;
- _supplierInfoService = supplierInfoService;
- _materielInfoService = materielInfoService;
- _outboundOrderService = outboundOrderService;
+ _outboundService = outboundService;
_taskService = taskService;
}
@@ -42,7 +39,73 @@
[HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
{
- return _taskService.TestToolOut(model.Content);
+ return _taskService.TestToolOut(model.Content);
+ }
+
+ /// <summary>
+ /// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("TestToolBack"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent TestToolBack([FromBody] Root<TestToolBackModel> model)
+ {
+ return _taskService.TestToolBack(model.Content);
+ }
+
+ /// <summary>
+ /// 娴嬭瘯鏋舵姤搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("TestToolScrap"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent TestScrap([FromBody] Root<TestToolScrap> model)
+ {
+ return _taskService.TestScrap(model.Content);
+ }
+
+ /// <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);
}
}
}
--
Gitblit v1.9.3