From d11b1f9c98e8765d3cee15abd4474b0e05a5acbc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 01 三月 2025 10:33:56 +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 | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 11 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 5af3526..71651e5 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"
@@ -11,29 +11,26 @@
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;
}
+
/// <summary>
/// 鎺ユ敹MES娴嬭瘯鏋跺嚭搴�
/// </summary>
@@ -44,6 +41,7 @@
{
return _taskService.TestToolOut(model.Content);
}
+
/// <summary>
/// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
/// </summary>
@@ -54,6 +52,7 @@
{
return _taskService.TestToolBack(model.Content);
}
+
/// <summary>
/// 娴嬭瘯鏋舵姤搴�
/// </summary>
@@ -64,5 +63,102 @@
{
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>
+ /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("PPSubsectionOut"), AllowAnonymous]
+ public MesResponseContent PPSubsectionOut([FromBody] Root<PPSubsectionOutModel> model)
+ {
+ return _taskService.PPSubsectionOut(model.Content);
+ }
+ /// <summary>
+ /// PP灏忓嵎鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("PPCutOut"), AllowAnonymous]
+ public MesResponseContent PPCutOut([FromBody] Root<PPCutOutModle> model)
+ {
+ return _taskService.PPCutOut(model.Content);
+ }
+
+ /// <summary>
+ /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("PPBack"), AllowAnonymous]
+ public MesResponseContent PPBack([FromBody] Root<PPBackModel> model)
+ {
+ return _taskService.PPBack(model.Content);
+ }
+
+ /// <summary>
+ /// PP搴撳瓨鏌ヨ
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("QueryPpByWidth"), AllowAnonymous]
+ public MesResponseContent QueryPpByWidth([FromBody] Root<QueryPpByWidthModel> model)
+ {
+ return _taskService.QueryPpByWidth(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>
+ /// 鎴愬搧杩斿伐鎻愬簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost,Route("RworkTask"),AllowAnonymous]
+ public MesResponseContent RworkTask([FromBody] RworkTaskModel model)
+ {
+ return _taskService.RworkTask(model);
+ }
+
}
}
--
Gitblit v1.9.3