上传最新

wangxinhui

2 天以前 2fbbc3ccaa4123a2d550fa64d91fa8ac25323a58

 ´úÂë¹ÜÀí/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)