更新代码，货位分配优化等

wangxinhui

2 天以前 2c889b38311883ceb703c4e0034c798fdaa2e21c

 代码管理/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>
@@ -194,7 +197,7 @@
            return _taskService.BoxStockin(model.Content);
        }
        /// <summary>
        /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
        /// MWMS鍚屾鎴愬搧鍑哄簱淇℃伅鑷矼ES
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("ShipmentOrderSync"), AllowAnonymous]
@@ -203,7 +206,7 @@
            return _taskService.ShipmentOrderSync(model);
        }
        /// <summary>
        /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
        /// WMS鍚屾鎴愬搧鍑哄簱淇℃伅鑷矼ES澶栧寘瑁呮満
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("ShipmentOrderMESSync"), AllowAnonymous]
@@ -284,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)