Merge branch 'wxw'

Administrator

2024-03-01 e6d5b88ce459fe8414aa7a96678820cc0246326c

 Wms/Wms/Controllers/BllSoController.cs

@@ -213,18 +213,18 @@
        {
            try
            {
                ////获取当前登录的用户ID
                //var claimsIdentity = this.User.Identity as ClaimsIdentity;
                //if (claimsIdentity == null)
                //{
                //    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                //}
                //var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                //if (string.IsNullOrWhiteSpace(userId))
                //{
                //    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                //}
                var bolls = _exNoticeSvc.AddExXmlStr(model.Id, 1);//int.Parse(userId)
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                var bolls = _exNoticeSvc.AddExXmlStr(model.Id, int.Parse(userId));
                 
                return Ok(new { code = 0, count = 0, msg = "生成出库单Xml", data= bolls.InnerXml.ToString() });
                 
@@ -767,5 +767,26 @@
        }

        #endregion

        /// <summary>
        /// 判断出库是否需要拆箱
        /// </summary>
        /// <param name="soNo"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult IsNeedUnpack(string soNo)
        {
            try
            {
                string result = _exNoticeSvc.IsNeedUnpack(soNo);

                return Ok(new { code = 0, data = result, msg = "成功" });

            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
    }
}