From f9bc97da02cdaf6ff9e05419b04b8e08c65c3eba Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 14 5月 2025 15:16:36 +0800 Subject: [PATCH] 222 --- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs | 45 ++++++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 17 deletions(-) diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs" index ed341d4..b1cf366 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs" @@ -41,7 +41,7 @@ /// <summary> /// 鑾峰彇鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="id">鏍囪瘑绗�.</param> + /// <param name="id">涓婚敭ID</param> /// <returns></returns> [HttpGet] [Route("{id}")] @@ -53,7 +53,7 @@ /// <summary> /// 鍒嗛〉鑾峰彇鐗╂枡鍩虹淇℃伅琛ㄧ殑鍒楄〃. /// </summary> - /// <param name="input">杈撳叆.</param> + /// <param name="input">鏌ヨ鍙傛暟</param> /// <returns></returns> [HttpGet] [Route("Page")] @@ -65,62 +65,72 @@ /// <summary> /// 鍒涘缓鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="input">杈撳叆.</param> + /// <param name="input">鍒涘缓鍙傛暟</param> /// <returns></returns> //[Authorize] [HttpPost] public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input) { - input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜� + input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜� return _wmsMaterialAppService.CreateAsync(input); } /// <summary> /// 鏇存柊鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="id">鏍囪瘑绗�.</param> - /// <param name="input">杈撳叆.</param> + /// <param name="id">涓婚敭ID</param> + /// <param name="input">鏇存柊鍙傛暟</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPut] [Route("{id}")] public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input) { - input.LastModifierName = _currentUser.UserAccount;//淇敼浜� + input.LastModifierName = _currentUser.UserAccount;//淇敼浜� return _wmsMaterialAppService.UpdateAsync(id, input); } /// <summary> /// 鍏嬮殕鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="ids">Id闆嗗悎.</param> + /// <param name="ids">Id闆嗗悎</param> /// <returns></returns> //[Authorize] [HttpPost] [Route("Clone")] public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids) { - return _wmsMaterialAppService.CloneAsync(ids); + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; + return _wmsMaterialAppService.CloneAsync(ids, myCurrentUser); } /// <summary> /// 鍒犻櫎鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="id">鏍囪瘑绗�.</param> + /// <param name="id">涓婚敭ID</param> /// <returns></returns> //[Authorize] [HttpDelete] [Route("{id}")] public virtual Task DeleteAsync(Guid id) { - //return _wmsMaterialAppService.DeleteAsync(id);//閫昏緫鍒犻櫎 - return _wmsMaterialAppService.DeletePermanentlyAsync(id);//鐗╃悊鍒犻櫎 + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; + //return _wmsMaterialAppService.DeleteAsync(id,myCurrentUser);//閫昏緫鍒犻櫎 + return _wmsMaterialAppService.DeletePermanentlyAsync(id, myCurrentUser);//鐗╃悊鍒犻櫎 } /// <summary> /// 鎵归噺鍒犻櫎鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="ids">The ids.</param> + /// <param name="ids">涓婚敭ID闆嗗悎</param> /// <returns></returns> //[Authorize] [HttpDelete] @@ -131,14 +141,14 @@ UserAccount = _currentUser.UserAccount, UserId = _currentUser.UserId }; - // return _wmsMaterialAppService.DeleteManyAsync(ids);//閫昏緫鍒犻櫎 - return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids);//鐗╃悊鍒犻櫎 + // return _wmsMaterialAppService.DeleteManyAsync(ids,myCurrentUser);//閫昏緫鍒犻櫎 + return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//鐗╃悊鍒犻櫎 } /// <summary> /// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅琛� /// </summary> - /// <param name="id">鏍囪瘑绗�.</param> + /// <param name="id">涓婚敭ID</param> /// <returns></returns> [HttpPut] [Route("{id}/AdjustSort/{sort}")] @@ -167,6 +177,7 @@ { throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸"); } + MyCurrentUser myCurrentUser = new MyCurrentUser() { UserAccount = _currentUser.UserAccount, -- Gitblit v1.9.3