Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-13 d794d5eef70ab31c7b06b5003abec095f030c23e

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs

@@ -1,5 +1,6 @@
using Ao.Lang; 
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters; 
using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
using CMS.Plugin.HIAWms.Application.Contracts.Services; 
using Microsoft.AspNetCore.Authorization; 
@@ -9,6 +10,7 @@
using System.Reflection; 
using Volo.Abp; 
using Volo.Abp.Application.Dtos; 
using CmsQueryExtensions.Entitys;
 
namespace CMS.Plugin.HIAWms.Controller 
{ 
@@ -24,14 +26,16 @@
    public class WmsMaterialController : ControllerBase 
    { 
        private readonly IWmsMaterialAppService _wmsMaterialAppService; 
        private readonly ICurrentUser _currentUser;
 
        /// <summary> 
        /// Initializes a new instance of the <see cref="WmsMaterialController"/> class. 
        /// </summary> 
        /// <param name="wmsMaterialAppService">The wmsMaterial application service.</param> 
        public WmsMaterialController(IWmsMaterialAppService wmsMaterialAppService) 
        public WmsMaterialController(IWmsMaterialAppService wmsMaterialAppService, ICurrentUser currentUser)
        { 
            _wmsMaterialAppService = wmsMaterialAppService; 
            _currentUser = currentUser;
        } 
 
        /// <summary> 
@@ -67,6 +71,7 @@
        [HttpPost] 
        public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input) 
        { 
            input.CreatorName = _currentUser.UserAccount;//创建人
            return _wmsMaterialAppService.CreateAsync(input); 
        } 
 
@@ -81,6 +86,7 @@
        [Route("{id}")] 
        public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input) 
        { 
            input.LastModifierName = _currentUser.UserAccount;//修改人
            return _wmsMaterialAppService.UpdateAsync(id, input); 
        } 
 
@@ -107,7 +113,8 @@
        [Route("{id}")] 
        public virtual Task DeleteAsync(Guid id) 
        { 
            return _wmsMaterialAppService.DeleteAsync(id); 
            //return _wmsMaterialAppService.DeleteAsync(id);//逻辑删除
            return _wmsMaterialAppService.DeletePermanentlyAsync(id);//物理删除
        } 
 
        /// <summary> 
@@ -119,7 +126,13 @@
        [HttpDelete] 
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids) 
        { 
            return _wmsMaterialAppService.DeleteManyAsync(ids); 
            MyCurrentUser myCurrentUser = new MyCurrentUser()
            {
                UserAccount = _currentUser.UserAccount,
                UserId = _currentUser.UserId
            };
            // return _wmsMaterialAppService.DeleteManyAsync(ids);//逻辑删除
            return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids);//物理删除
        } 
 
        /// <summary> 
@@ -154,11 +167,15 @@
            { 
                throw new UserFriendlyException("请检查导入的表格"); 
            } 
 
            MyCurrentUser myCurrentUser = new MyCurrentUser()
            {
                UserAccount = _currentUser.UserAccount,
                UserId = _currentUser.UserId
            };
            await _wmsMaterialAppService.ImportAsync(new WmsMaterialsImportModel 
            { 
                WmsMaterials = wmsMaterialRows, 
            }); 
            }, myCurrentUser);
 
            return Ok(); 
        }