Merge branch 'wxw'

wxw

3 天以前 35d7109801b437fad4514047db521ae358a1b7ca

 Wms/Wms/Controllers/PdaAsnController.cs

@@ -267,7 +267,7 @@


        /// <summary>
        /// 绑定托盘
        /// 车间入库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -938,5 +938,38 @@
            }
        }
        #endregion

        #region 仓库收货
        /// <summary>
        /// 仓库确认收货
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult ConfirmTakeOf(PalletBindVm model)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(UserId))
                {
                    throw new Exception("未获取到用户信息");
                }

                _PdaAsnSvc.ConfirmTakeOf(model.PalletNo, int.Parse(UserId));

                return Ok(new { code = 0, msg = "收货成功!" });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        #endregion
    }
}