修改命名空间

zs

2025-05-14 505a15c0e864d12b13ab639e8e2f5984763aac49

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs

@@ -7,6 +7,8 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using CmsQueryExtensions;

namespace CMS.Plugin.HIAWms.Application.Implements;

@@ -14,14 +16,16 @@
public class WmsAreaAppService : CMSPluginAppService, IWmsAreaAppService
{
    private readonly IWmsAreaRepository _wmsareaRepository;
    private readonly IWmsStoreRepository _wmsstoreRepository;

    /// <summary>
    /// Initializes a new instance of the <see cref="WmsAreaAppService"/> class.
    /// </summary>
    /// <param name="wmsareaRepository">The task job repository.</param>
    public WmsAreaAppService(IWmsAreaRepository wmsareaRepository)
    public WmsAreaAppService(IWmsAreaRepository wmsareaRepository, IWmsStoreRepository wmsstoreRepository)
    {
        _wmsareaRepository = wmsareaRepository;
        _wmsstoreRepository = wmsstoreRepository;
    }

    /// <inheritdoc />
@@ -31,7 +35,7 @@
    }

    /// <inheritdoc />
    public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input)
    public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreaInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -41,8 +45,9 @@
        }

        var specification = new WmsAreaSpecification(input.Name);
        var count = await _wmsareaRepository.GetCountAsync(input.Filter, specification);
        var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);
        var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input);
        var count = await _wmsareaRepository.GetCountAsync(area,input.Filter, specification);
        var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);

        return new PagedResultDto<WmsAreaDto>(count, ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list));
    }
@@ -60,12 +65,16 @@

        var maxSort = await _wmsareaRepository.GetMaxSortAsync();
        var sort = input.Sort ?? maxSort;
        var wmsarea = new WmsArea
        var wmsarea = ObjectMapper.Map<WmsAreaCreateDto, WmsArea>(input);
        wmsarea.Sort = sort;
        var store = await _wmsstoreRepository.FindByNameAsync(input.StoreCode);
        if (store == null)
        {
            throw new UserFriendlyException("仓库信息不存");
        }

        };
        input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);

        wmsarea.StoreName = store.StoreName;
        await _wmsareaRepository.InsertAsync(wmsarea);

        if (input.Sort.HasValue && wmsarea.Sort != maxSort)
@@ -90,8 +99,18 @@

        wmsarea.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
        var store = await _wmsstoreRepository.FindByNameAsync(input.StoreCode);
        if (store == null)
        {
            throw new UserFriendlyException("仓库信息不存");
        }

        wmsarea.AreaNo = input.AreaNo;
        wmsarea.AreaName = input.AreaName;
        wmsarea.AreaDesc = input.AreaDesc;
        wmsarea.AreaStatus = input.AreaStatus;
        wmsarea.AreaType = input.AreaType;
        wmsarea.StoreCode = input.StoreCode;
        wmsarea.StoreName = store.StoreName;

        await _wmsareaRepository.UpdateAsync(wmsarea);

@@ -150,7 +169,7 @@
    /// <inheritdoc />
    public virtual async Task AdjustSortAsync(Guid id, int sort)
    {
        var list = await _wmsareaRepository.GetListAsync(nameof(WmsArea.Sort));
        var list = await _wmsareaRepository.GetListAsync(null,nameof(WmsArea.Sort));
        if (list != null && list.Any())
        {
            var initSort = 1;
@@ -217,13 +236,17 @@
                    throw new UserFriendlyException(errorMsg);
                }

                var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaName);
                var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaNo);
                if (oldWmsArea != null)
                {
                    var wmsareaUpdateDto = new WmsAreaUpdateDto
                    {
                        AreaNo = wmsarea.AreaNo,
                        AreaName = wmsarea.AreaName,
                        AreaDesc = wmsarea.AreaDesc,
                        AreaStatus = wmsarea.AreaStatus,
                        AreaType = wmsarea.AreaType,
                        StoreCode = wmsarea.StoreCode,
                        StoreName = wmsarea.StoreName,
                        Remark = wmsarea.Remark,
                    };

@@ -233,8 +256,12 @@
                {
                    var wmsareaCreateDto = new WmsAreaCreateDto
                    {
                        AreaNo = wmsarea.AreaNo,
                        AreaName = wmsarea.AreaName,
                        AreaDesc = wmsarea.AreaDesc,
                        AreaStatus = wmsarea.AreaStatus,
                        AreaType = wmsarea.AreaType,
                        StoreCode = wmsarea.StoreCode,
                        StoreName = wmsarea.StoreName,
                        Remark = wmsarea.Remark,
                    };

@@ -273,7 +300,7 @@
    }

    /// <inheritdoc />
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input)
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -283,12 +310,13 @@
        }

        var specification = new WmsAreaSpecification(input.Name);
        var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
        var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input);
        var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list);

        var sheets = new Dictionary<string, object>
        {
            ["配置"] = result.Select(x => x.GetExportData()).ToList(),
            ["配置"] = ExportHelper.ConvertListToExportData(result),
        };

        var fileName = result.Count > 1 ? "WmsArea列表" : result.Count == 1 ? result.First()?.AreaName : "WmsArea模版";