Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

zhaowc

2025-01-20 f2bc08e28dda7022202f07217f6a3c150f818af7

 Wms/Wms/Controllers/BllQualityController.cs

@@ -5,6 +5,7 @@
using System;
using WMS.Entity.BllQualityEntity;
using WMS.IBLL.IBllQualityServer;
using Model.ModelVm;

namespace Wms.Controllers
{
@@ -40,7 +41,7 @@
            {
                var bolls = _qualityServer.GetBllQualityList(model);

                return Ok(new { code = 0, msg = "质检信息", data = bolls });
                return Ok(new { code = 0,count = bolls.Count, msg = "质检信息", data = bolls });
            }
            catch (Exception e)
            {
@@ -73,6 +74,39 @@
                model.CreateUser = int.Parse(userId);
                _qualityServer.InsertQuality(model);

                return Ok(new { code = 0, count = 0, msg = "物料质检信息添加成功", data = "" });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }



        /// <summary>
        /// 添加复核信息
        /// </summary>
        /// <param name="model">质检信息实体模型</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult InsertFuHe(FinshVm model)
        {
            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 = "未获取到当前操作人信息" });
                }
                _qualityServer.FinshQuality(model.Id,model.UserNo,model.Password, int.Parse(userId));

                return Ok(new { code = 0, count = 0, msg = "物料质检信息操作成功", data = "" });
            }
            catch (Exception e)
@@ -81,6 +115,7 @@
            }
        }


        #endregion
    }
}