3

schangxiang@126.com

2025-05-13 448177c5f07c2a63071fe3ebb5bb79894b0606ed

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

@@ -1,5 +1,6 @@
using Ao.Lang; 
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 
{ 
@@ -23,115 +25,136 @@
    [Route("api/v{version:apiVersion}/HIAWms/[controller]")] 
    public class WmsMaterialController : ControllerBase 
    { 
        private readonly IWmsMaterialAppService _wmsmaterialsAppService; 
        private readonly IWmsMaterialAppService _wmsMaterialAppService; 
        private readonly ICurrentUser _currentUser; 
 
        /// <summary> 
        /// Initializes a new instance of the <see cref="WmsMaterialController"/> class. 
        /// </summary> 
        /// <param name="wmsmaterialsAppService">The wmsmaterials application service.</param> 
        public WmsMaterialController(IWmsMaterialAppService wmsmaterialsAppService) 
        /// <param name="wmsMaterialAppService">The wmsMaterial application service.</param> 
        public WmsMaterialController(IWmsMaterialAppService wmsMaterialAppService, ICurrentUser currentUser) 
        { 
            _wmsmaterialsAppService = wmsmaterialsAppService; 
            _wmsMaterialAppService = wmsMaterialAppService; 
            _currentUser = currentUser; 
        } 
 
        /// <summary> 
        /// èŽ·å–物料基础信息表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <param name="id">主键ID</param> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("{id}")] 
        public virtual Task<WmsMaterialDto> GetAsync(Guid id) 
        { 
            return _wmsmaterialsAppService.GetAsync(id); 
            return _wmsMaterialAppService.GetAsync(id); 
        } 
 
        /// <summary> 
        /// åˆ†é¡µèŽ·å–物料基础信息表的列表. 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <param name="input">查询参数</param> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("Page")] 
        public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input) 
        { 
            return _wmsmaterialsAppService.GetListAsync(input); 
            return _wmsMaterialAppService.GetListAsync(input); 
        } 
 
        /// <summary> 
        /// åˆ›å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <param name="input">创建参数</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPost] 
        public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input) 
        { 
            return _wmsmaterialsAppService.CreateAsync(input); 
            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] 
        [HttpPut] 
        [Route("{id}")] 
        public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input) 
        { 
            return _wmsmaterialsAppService.UpdateAsync(id, input); 
            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 _wmsmaterialsAppService.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 _wmsmaterialsAppService.DeleteAsync(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] 
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids) 
        { 
            return _wmsmaterialsAppService.DeleteManyAsync(ids); 
            MyCurrentUser myCurrentUser = new MyCurrentUser() 
            { 
                UserAccount = _currentUser.UserAccount, 
                UserId = _currentUser.UserId 
            }; 
            // 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}")] 
        public virtual Task AdjustSortAsync(Guid id, int sort) 
        { 
            return _wmsmaterialsAppService.AdjustSortAsync(id, sort); 
            return _wmsMaterialAppService.AdjustSortAsync(id, sort); 
        } 
 
        /// <summary> 
@@ -148,17 +171,22 @@
            stream.Seek(0L, SeekOrigin.Begin); 
 
            var sheetNames = stream.GetSheetNames(); 
            var wmsmaterialsRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new(); 
            var wmsMaterialRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new(); 
 
            if (!wmsmaterialsRows.Any()) 
            if (!wmsMaterialRows.Any()) 
            { 
                throw new UserFriendlyException("请检查导入的表格"); 
            } 
 
            await _wmsmaterialsAppService.ImportAsync(new WmsMaterialsImportModel 
            MyCurrentUser myCurrentUser = new MyCurrentUser() 
            { 
                WmsMaterials = wmsmaterialsRows, 
            }); 
                UserAccount = _currentUser.UserAccount, 
                UserId = _currentUser.UserId 
            }; 
            await _wmsMaterialAppService.ImportAsync(new WmsMaterialsImportModel 
            { 
                WmsMaterials = wmsMaterialRows, 
           },myCurrentUser);  
 
            return Ok(); 
        } 
@@ -172,7 +200,7 @@
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input) 
        { 
            input.MaxResultCount = int.MaxValue; 
            var exportData = await _wmsmaterialsAppService.ExportAsync(input); 
            var exportData = await _wmsMaterialAppService.ExportAsync(input); 
            var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial导出模板.xlsx"); 
            if (!System.IO.File.Exists(templatePath)) 
            {