From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 e63332c..d9fe9c0 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>
@@ -284,6 +287,11 @@
[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);
+ }
string content = _invokeERPService.InvokeCheckOrderApi(model.Content);
ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>();
if (requestContent.res != 1)
--
Gitblit v1.9.3