Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

昨天 526b70eecc5dac5aea91bfffbe0b98118f25827f

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs

@@ -46,7 +46,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>
@@ -254,9 +273,9 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate]
        public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model)
        public MesResponseContent CheckResultReturn([FromBody] Root<ERPCheckModel>  model)
        {
            string content = _invokeERPService.InvokeCheckOrderApi(model);
            string content = _invokeERPService.InvokeCheckOrderApi(model.Content);
            ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>();
            if (requestContent.res != 1)
            {