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

zs

2025-05-06 44f6b5306f7927485c49d4655d370f4693cdabfd

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

@@ -1,4 +1,4 @@
using Ao.Lang;
using Ao.Lang; 
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -13,7 +13,7 @@
namespace CMS.Plugin.HIAWms.Controller
{
    /// <summary>
    /// ç‰©æ–™åŸºç¡€ä¿¡æ¯æœåŠ¡
    /// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨æœåŠ¡ 
    /// </summary>
    [ApiController]
    [TypeFilter(typeof(CMSLanguageFilter))]
@@ -23,19 +23,19 @@
    [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
    public class WmsMaterialController : ControllerBase
    {
        private readonly IWmsMaterialAppService _wmsmaterialAppService;
        private readonly IWmsMaterialAppService _wmsmaterialsAppService; 

        /// <summary>
        /// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
        /// </summary>
        /// <param name="wmsmaterialAppService">The wmsmaterial application service.</param>
        public WmsMaterialController(IWmsMaterialAppService wmsmaterialAppService)
        /// <param name="wmsmaterialsAppService">The wmsmaterials application service.</param> 
        public WmsMaterialController(IWmsMaterialAppService wmsmaterialsAppService) 
        {
            _wmsmaterialAppService = wmsmaterialAppService;
            _wmsmaterialsAppService = wmsmaterialsAppService; 
        }

        /// <summary>
        /// èŽ·å–物料基础信息
        /// èŽ·å–物料基础信息表 
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
@@ -43,11 +43,11 @@
        [Route("{id}")]
        public virtual Task<WmsMaterialDto> GetAsync(Guid id)
        {
            return _wmsmaterialAppService.GetAsync(id);
            return _wmsmaterialsAppService.GetAsync(id); 
        }

        /// <summary>
        /// åˆ†é¡µèŽ·å–物料基础信息的列表.
        /// åˆ†é¡µèŽ·å–物料基础信息表的列表. 
        /// </summary>
        /// <param name="input">输入.</param>
        /// <returns></returns>
@@ -55,11 +55,11 @@
        [Route("Page")]
        public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
        {
            return _wmsmaterialAppService.GetListAsync(input);
            return _wmsmaterialsAppService.GetListAsync(input); 
        }

        /// <summary>
        /// åˆ›å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// åˆ›å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <param name="input">输入.</param>
        /// <returns></returns>
@@ -67,11 +67,11 @@
        [HttpPost]
        public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
        {
            return _wmsmaterialAppService.CreateAsync(input);
            return _wmsmaterialsAppService.CreateAsync(input); 
        }

        /// <summary>
        /// æ›´æ–°ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// æ›´æ–°ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <param name="input">输入.</param>
@@ -81,11 +81,11 @@
        [Route("{id}")]
        public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
        {
            return _wmsmaterialAppService.UpdateAsync(id, input);
            return _wmsmaterialsAppService.UpdateAsync(id, input); 
        }

        /// <summary>
        /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <param name="ids">Id集合.</param>
        /// <returns></returns>
@@ -94,11 +94,11 @@
        [Route("Clone")]
        public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
        {
            return _wmsmaterialAppService.CloneAsync(ids);
            return _wmsmaterialsAppService.CloneAsync(ids); 
        }

        /// <summary>
        /// åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
@@ -107,11 +107,11 @@
        [Route("{id}")]
        public virtual Task DeleteAsync(Guid id)
        {
            return _wmsmaterialAppService.DeleteAsync(id);
            return _wmsmaterialsAppService.DeleteAsync(id); 
        }

        /// <summary>
        /// æ‰¹é‡åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// æ‰¹é‡åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <param name="ids">The ids.</param>
        /// <returns></returns>
@@ -119,11 +119,11 @@
        [HttpDelete]
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
        {
            return _wmsmaterialAppService.DeleteManyAsync(ids);
            return _wmsmaterialsAppService.DeleteManyAsync(ids); 
        }

        /// <summary>
        /// è°ƒæ•´æŽ’序物料基础信息
        /// è°ƒæ•´æŽ’序物料基础信息表 
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
@@ -131,11 +131,11 @@
        [Route("{id}/AdjustSort/{sort}")]
        public virtual Task AdjustSortAsync(Guid id, int sort)
        {
            return _wmsmaterialAppService.AdjustSortAsync(id, sort);
            return _wmsmaterialsAppService.AdjustSortAsync(id, sort); 
        }

        /// <summary>
        /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <returns></returns>
        [Authorize]
@@ -148,23 +148,23 @@
            stream.Seek(0L, SeekOrigin.Begin);

            var sheetNames = stream.GetSheetNames();
            var wmsmaterialRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new();
            var wmsmaterialsRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new(); 

            if (!wmsmaterialRows.Any())
            if (!wmsmaterialsRows.Any()) 
            {
                throw new UserFriendlyException("请检查导入的表格");
            }

            await _wmsmaterialAppService.ImportAsync(new WmsMaterialsImportModel
            await _wmsmaterialsAppService.ImportAsync(new WmsMaterialsImportModel 
            {
                WmsMaterials = wmsmaterialRows,
                WmsMaterials = wmsmaterialsRows, 
            });

            return Ok();
        }

        /// <summary>
        /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary>
        /// <returns></returns>
        [HttpGet]
@@ -172,7 +172,7 @@
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmsmaterialAppService.ExportAsync(input);
            var exportData = await _wmsmaterialsAppService.ExportAsync(input); 
            var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial导出模板.xlsx");
            if (!System.IO.File.Exists(templatePath))
            {