From 2fbbc3ccaa4123a2d550fa64d91fa8ac25323a58 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 11 七月 2025 15:32:03 +0800
Subject: [PATCH] 上传最新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 6f7f214..5330a30 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"
@@ -16,6 +16,7 @@
using WIDESEA_DTO.Stock;
using WIDESEA_External.Model;
using WIDESEA_External.ERPService;
+using WIDESEA_ICheckService;
namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -29,11 +30,13 @@
private readonly IOutboundService _outboundService;
private readonly ITaskService _taskService;
private readonly IInvokeERPService _invokeERPService;
- public MesController(IOutboundService outboundService, ITaskService taskService,IInvokeERPService invokeERPService)
+ private readonly ICheckOrderResultService _checkOrderResultService;
+ public MesController(IOutboundService outboundService, ITaskService taskService,IInvokeERPService invokeERPService, ICheckOrderResultService checkOrderResultService)
{
_outboundService = outboundService;
_taskService = taskService;
_invokeERPService = invokeERPService;
+ _checkOrderResultService=checkOrderResultService;
}
/// <summary>
@@ -46,7 +49,26 @@
{
return _taskService.TestToolOut(model.Content);
}
-
+ /// <summary>
+ /// 鎺ユ敹MES闃茬剨娲惧伐
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SolderMaskOutNotice"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent SolderMaskOutNotice([FromBody] Root<SolderMaskOutNotice> model)
+ {
+ return _taskService.SolderMaskOutNotice(model.Content);
+ }
+ /// <summary>
+ /// 鎺ユ敹MES闃茬剨鍒扮嚎杈�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SolderMaskOut"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent SolderMaskOut([FromBody] Root<SolderMaskOut> model)
+ {
+ return _taskService.SolderMaskOut(model.Content);
+ }
/// <summary>
/// 鎺ユ敹MES娴嬭瘯鏋堕��搴�
/// </summary>
@@ -184,6 +206,15 @@
return _taskService.ShipmentOrderSync(model);
}
/// <summary>
+ /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ShipmentOrderMESSync"), AllowAnonymous]
+ public WebResponseContent ShipmentOrderMESSync([FromBody] MesShipmentOrderSync model)
+ {
+ return _taskService.ShipmentOrderMESSync(model);
+ }
+ /// <summary>
/// 鎴愬搧杩斿伐鎻愬簱
/// </summary>
/// <param name="model"></param>
@@ -256,6 +287,12 @@
[HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate]
public MesResponseContent CheckResultReturn([FromBody] Root<ERPCheckModel> model)
{
+ WebResponseContent responseContent = _checkOrderResultService.CommitCheckResult(model.Content);
+ if (!responseContent.Status)
+ {
+ return MesResponseContent.Instance.Error(responseContent.Message);
+ }
+ model.Content.CreatorCode = "QMS";
string content = _invokeERPService.InvokeCheckOrderApi(model.Content);
ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>();
if (requestContent.res != 1)
--
Gitblit v1.9.3