+1

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1822,13 +1822,10 @@ namespace OASystem.API.Controllers
         /// 物品 详情
         /// </summary>
         /// <returns></returns>
-        [HttpGet("id")]
+        [HttpGet()]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GoodsInfo(int portType, int id)
         {
-            //var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
-            //if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
-
             if (portType > 1 || portType > 3) return Ok(JsonView(false, MsgTips.Port));
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
 
@@ -1863,12 +1860,14 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpDelete("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GoodsDel(int id,[FromQuery] int currUserId)
+        public async Task<IActionResult> GoodsDel(int id)
         {
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
-            if (currUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
-            return Ok(await _goodsRep.GoodsDel(id,currUserId));
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
+            return Ok(await _goodsRep.GoodsDel(id, _currUserInfo.UserId));
         }
 
         /// <summary>
@@ -1891,14 +1890,14 @@ namespace OASystem.API.Controllers
         /// 入库 详情
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
+        [HttpGet("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GoodsStorageInfo(int portType, int id)
+        public async Task<IActionResult> GoodsStorageInfo([FromQuery] int portType, int id)
         {
             if (portType > 1 || portType > 3) return Ok(JsonView(false, MsgTips.Port));
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
 
-            return Ok(await _goodsRep.GoodsStorageInfo(portType,id));
+            return Ok(await _goodsRep.GoodsStorageInfo(portType, id));
         }
 
         /// <summary>
@@ -1910,6 +1909,9 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GoodsStorageOP(GoodsStorageOPDTO _dto)
         {
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             var vadalitor = new GoodsStorageOPDTOValidator();
             var vadalitorRes = await vadalitor.ValidateAsync(_dto);
             if (!vadalitorRes.IsValid)
@@ -1919,7 +1921,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, sb.ToString()));
             }
 
-            return Ok(await _goodsRep.GoodsStorageOP(_dto));
+            return Ok(await _goodsRep.GoodsStorageOP(_dto, _currUserInfo.UserId));
         }
 
         /// <summary>
@@ -1929,12 +1931,14 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpDelete("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GoodsStorageDel(int id, [FromQuery] int currUserId)
+        public async Task<IActionResult> GoodsStorageDel(int id)
         {
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
-            if (currUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
-            return Ok(await _goodsRep.GoodsStorageDel(id,currUserId));
+            return Ok(await _goodsRep.GoodsStorageDel(id, _currUserInfo.UserId));
         }
 
         /// <summary>
@@ -1957,9 +1961,9 @@ namespace OASystem.API.Controllers
         /// 领用详情
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
+        [HttpGet("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GoodsReceiveInfo(int portType, int id)
+        public async Task<IActionResult> GoodsReceiveInfo([FromQuery]int portType, int id)
         {
             if (portType > 1 || portType > 3) return Ok(JsonView(false, MsgTips.Port));
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
@@ -1976,6 +1980,9 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GoodsReceiveOP(GoodsReceiveOPDTO _dto)
         {
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             var vadalitor = new GoodsReceiveOPDTOValidator();
             var vadalitorRes = await vadalitor.ValidateAsync(_dto);
             if (!vadalitorRes.IsValid)
@@ -1985,7 +1992,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, sb.ToString()));
             }
 
-            return Ok(await _goodsRep.GoodsReceiveOP(_dto));
+            return Ok(await _goodsRep.GoodsReceiveOP(_dto, _currUserInfo.UserId));
         }
 
         /// <summary>
@@ -1998,6 +2005,9 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GoodsReceiveAudit(GoodsReceiveAuditDTO _dto)
         {
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             var vadalitor = new GoodsReceiveAuditDTOValidator();
             var vadalitorRes = await vadalitor.ValidateAsync(_dto);
             if (!vadalitorRes.IsValid)
@@ -2015,7 +2025,7 @@ namespace OASystem.API.Controllers
                                     else return id;
                                 })
                                 .ToArray();
-            return Ok(await _goodsRep.GoodsReceiveAudit(idArray,_dto.CurrUserId,_dto.AuditEnum));
+            return Ok(await _goodsRep.GoodsReceiveAudit(idArray, _currUserInfo.UserId, _dto.AuditEnum));
         }
         
         /// <summary>
@@ -2025,12 +2035,14 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpDelete("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GoodsReceiveDel(int id, [FromQuery] int currUserId)
+        public async Task<IActionResult> GoodsReceiveDel(int id)
         {
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
-            if (currUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
-            return Ok(await _goodsRep.GoodsReceiveDel(id, currUserId));
+            return Ok(await _goodsRep.GoodsReceiveDel(id, _currUserInfo.UserId));
         }
         #endregion
     }

OASystem/OASystem.Domain/Dtos/PersonnelModule/GoodsDTO.cs

@@ -103,11 +103,6 @@ namespace OASystem.Domain.Dtos.PersonnelModule
     /// </summary>
     public class GoodsStorageOPDTO
     {
-        /// <summary>
-        /// 当前用户id
-        /// </summary>
-        public int CurrUserId { get; set; }
-
         /// <summary>
         /// ID编号
         /// ID > 0 Edit
@@ -173,7 +168,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public GoodsStorageOPDTOValidator()
         {
-            RuleFor(x => x.CurrUserId).Must(x => x > 0).WithMessage("请传入当前登陆用户ID!");
+            //RuleFor(x => x.CurrUserId).Must(x => x > 0).WithMessage("请传入当前登陆用户ID!");
             RuleFor(x => x.GoodsId).Must(x => x > 0).WithMessage("请传入有效的物品Id!");
             RuleFor(x => x.Quantity).Must(x => x > 0).WithMessage("请传入有效的物品数量!");
             RuleFor(x => x.UnitPrice).Must(x => x > 0).WithMessage("请传入有效的物品单价!");
@@ -208,8 +203,6 @@ namespace OASystem.Domain.Dtos.PersonnelModule
     /// </summary>
     public class GoodsReceiveOPDTO
     {
-        public int CurrUserId { get; set; }
-
         /// <summary>
         /// ID
         /// Id > 0 修改
@@ -274,11 +267,6 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public string Label { get; set; }
 
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        public int CurrUserId { get; set; }
-
         /// <summary>
         /// 审核状态
         /// </summary>
@@ -296,7 +284,6 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public GoodsReceiveAuditDTOValidator()
         {
-            RuleFor(x => x.CurrUserId).Must(x => x > 0).WithMessage("请传入当前登陆用户ID!");
             RuleFor(x => x.Label).NotEmpty().WithMessage("数据ID字符串为空!");
         }
     }

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -315,7 +315,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                                       .LeftJoin<Pm_GoodsInfo>((gs, gi) => gs.GoodsId == gi.Id)
                                       .LeftJoin<Sys_Users>((gs, gi, u) => gs.CreateUserId == u.Id)
                                       .Where((gs, gi, u) => gs.IsDel == 0)
-                                      .WhereIF(id > 0, (gs, gi, u) => gs.GoodsId == id)
+                                      .WhereIF(id > 0, (gs, gi, u) => gs.Id == id)
                                       .Select((gs, gi, u) => new
                                       {
                                           gs.Id,
@@ -343,12 +343,13 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         /// <summary>
         /// 物品入库 操作(Create Or Edit)
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="_dto"></param>
+        /// <param name="currUserId"></param>
         /// <returns></returns>
-        public async Task<JsonView> GoodsStorageOP(GoodsStorageOPDTO _dto)
+        public async Task<JsonView> GoodsStorageOP(GoodsStorageOPDTO _dto,int currUserId)
         {
             var info = _mapper.Map<Pm_GoodsStorage>(_dto);
-            info.CreateUserId = _dto.CurrUserId;
+            info.CreateUserId = currUserId;
 
             decimal editAgoQauntity = 0.00M,
                     editAgoTotalPrice = 0.00M;
@@ -397,7 +398,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             goodsInfo.SQ_Total = goodsInfo.SQ_Total - editAgoQauntity + info.Quantity;
             goodsInfo.StockQuantity = goodsInfo.StockQuantity - editAgoQauntity + info.Quantity;
             goodsInfo.PriceTotal = goodsInfo.PriceTotal - editAgoTotalPrice + info.TotalPrice;
-            goodsInfo.LastUpdateUserId = _dto.CurrUserId;
+            goodsInfo.LastUpdateUserId = currUserId;
             goodsInfo.LastUpdateTime = DateTime.Now;
 
             var goodsEdit = await _sqlSugar.Updateable(goodsInfo)
@@ -545,7 +546,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                                       .LeftJoin<Sys_Users>((gr, gi, u1) => gr.AuditUserId == u1.Id)
                                       .LeftJoin<Sys_Users>((gr, gi, u1, u2) => gr.CreateUserId == u2.Id)
                                       .Where((gr, gi, u1, u2) => gr.IsDel == 0)
-                                      .WhereIF(id > 0, (gr, gi, u1, u2u) => gr.GoodsId == id)
+                                      .WhereIF(id > 0, (gr, gi, u1, u2u) => gr.Id == id)
                                       .Select((gr, gi, u1, u2) => new
                                       {
                                           gr.Id,
@@ -574,12 +575,13 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         /// <summary>
         /// 物品领用 OP(Add Or Edit)
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="_dto"></param>
+        /// <param name="currUserId"></param>
         /// <returns></returns>
-        public async Task<JsonView> GoodsReceiveOP(GoodsReceiveOPDTO _dto)
+        public async Task<JsonView> GoodsReceiveOP(GoodsReceiveOPDTO _dto,int currUserId)
         {
             var info = _mapper.Map<Pm_GoodsReceive>(_dto);
-            info.CreateUserId = _dto.CurrUserId;
+            info.CreateUserId = currUserId;
             _sqlSugar.BeginTran();
 
             //物品现有库存