HIA24016N管子线DEMO开发
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zs
2025-05-13 90c84f7521d4979b2e40965e7255e196d07d9e75 
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs


@@ -1,13 +1,14 @@


using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;


using CMS.Plugin.HIAWms.Application.Contracts.Services;


using CMS.Plugin.HIAWms.Domain.Shared;


using CMS.Plugin.HIAWms.Domain.Shared.Util;


using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials;


using CMS.Plugin.HIAWms.Domain.WmsMaterials;


using CmsQueryExtensions;


using Volo.Abp;


using Volo.Abp.Application.Dtos;


using Volo.Abp.Data;


using Volo.Abp.ObjectExtending;


using Volo.Abp.ObjectMapping;




namespace CMS.Plugin.HIAWms.Application.Implements;




@@ -42,8 +43,10 @@


        }




        var specification = new WmsMaterialSpecification(input.Name);


        var count = await _wmsmaterialRepository.GetCountAsync(input.Filter, specification);


        var list = await _wmsmaterialRepository.GetListAsync(input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);


        var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);


        var count = await _wmsmaterialRepository.GetCountAsync(material,input.Filter, specification);




        var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);




        return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));


    }


@@ -53,10 +56,10 @@


    {


        await CheckCreateOrUpdateDtoAsync(input);




        var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialCode);


        var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialNo);


        if (exist)


        {


            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);


            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);


        }




        var maxSort = await _wmsmaterialRepository.GetMaxSortAsync();


@@ -82,10 +85,10 @@


        await CheckCreateOrUpdateDtoAsync(input);




        var wmsmaterial = await _wmsmaterialRepository.GetAsync(id);


        var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialCode, wmsmaterial.Id);


        var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialNo, wmsmaterial.Id);


        if (exist)


        {


            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);


            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);


        }




        wmsmaterial.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);


@@ -102,6 +105,7 @@


        wmsmaterial.Length = input.Length;


        wmsmaterial.IsMainBranch = input.IsMainBranch;


        wmsmaterial.Factory = input.Factory;


        wmsmaterial.MaterialModel = input.MaterialModel;


        wmsmaterial.Certification = input.Certification;




        await _wmsmaterialRepository.UpdateAsync(wmsmaterial);


@@ -163,7 +167,7 @@


    /// <inheritdoc />


    public virtual async Task AdjustSortAsync(Guid id, int sort)


    {


        var list = await _wmsmaterialRepository.GetListAsync(nameof(WmsMaterial.Sort));


        var list = await _wmsmaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));


        if (list != null && list.Any())


        {


            var initSort = 1;


@@ -207,7 +211,7 @@


            #region 导入校验




            // 判断名称是否重复，并输出第几行重复


            var duplicateWmsMaterials = wmsmaterials.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();


            var duplicateWmsMaterials = wmsmaterials.GroupBy(x => x.MaterialNo).Where(x => x.Count() > 1).ToList();


            if (duplicateWmsMaterials?.Any() == true)


            {


                var duplicateWmsMaterialMsgs = duplicateWmsMaterials.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} 行：{x.Key}  名称重复");


@@ -219,23 +223,23 @@




            foreach (var wmsmaterial in wmsmaterials)


            {


                if (wmsmaterial.MaterialCode.IsNullOrWhiteSpace() && wmsmaterial.MaterialName.IsNullOrWhiteSpace())


                if (wmsmaterial.MaterialNo.IsNullOrWhiteSpace() && wmsmaterial.MaterialName.IsNullOrWhiteSpace())


                {


                    continue;


                }




                if (wmsmaterial.MaterialCode.IsNullOrWhiteSpace())


                if (wmsmaterial.MaterialNo.IsNullOrWhiteSpace())


                {


                    var errorMsg = $"导入失败！配置，第{wmsmaterial.RowIndex}行：WmsMaterial名称不能为空";


                    throw new UserFriendlyException(errorMsg);


                }




                var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(wmsmaterial.MaterialCode);


                var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(wmsmaterial.MaterialNo);


                if (oldWmsMaterial != null)


                {


                    var wmsmaterialUpdateDto = new WmsMaterialUpdateDto


                    {


                        MaterialCode = wmsmaterial.MaterialCode,


                        MaterialNo = wmsmaterial.MaterialNo,


                        MaterialName = wmsmaterial.MaterialName,


                        PurchaseType = wmsmaterial.PurchaseType,


                        MaterialType = wmsmaterial.MaterialType,


@@ -257,7 +261,7 @@


                {


                    var wmsmaterialCreateDto = new WmsMaterialCreateDto


                    {


                        MaterialCode = wmsmaterial.MaterialCode,


                        MaterialNo = wmsmaterial.MaterialNo,


                        MaterialName = wmsmaterial.MaterialName,


                        PurchaseType = wmsmaterial.PurchaseType,


                        MaterialType = wmsmaterial.MaterialType,


@@ -318,7 +322,9 @@


        }




        var specification = new WmsMaterialSpecification(input.Name);


        var list = await _wmsmaterialRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);




        var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);


        var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);


        var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);




        var sheets = new Dictionary<string, object>


@@ -326,7 +332,7 @@


            ["配置"] = ExportHelper.ConvertListToExportData(result),


        };




        var fileName = result.Count > 1 ? "WmsMaterial列表" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial模版";


        var fileName = result.Count > 1 ? "WmsMaterial列表" : result.Count == 1 ? result[0]?.MaterialNo : "WmsMaterial模版";


        return (sheets, fileName);


    }




@@ -337,7 +343,7 @@


    protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialCreateOrUpdateDtoBase input)


    {


        Check.NotNull(input, nameof(input));


        Check.NotNullOrWhiteSpace(input.MaterialCode, "编号", WmsMaterialConsts.MaxCodeLength);


        Check.NotNullOrWhiteSpace(input.MaterialNo, "编号", WmsMaterialConsts.MaxCodeLength);


        Check.NotNullOrWhiteSpace(input.MaterialName, "名称", WmsMaterialConsts.MaxNameLength);


        Check.Length(input.Remark, "备注", WmsMaterialConsts.MaxRemarkLength);


        return Task.CompletedTask;