From ed8fc204b96456f5b43f8cf860de6c91f504f97b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 30 4月 2025 20:22:12 +0800
Subject: [PATCH] 库区库位后端代码
---
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs | 32 +++++
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs | 1
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs | 1
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs | 11 ++
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs | 11 +
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs | 17 +++
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs | 21 ++++
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs | 17 +++
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs | 24 ++++
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs | 7 +
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs | 31 ++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 13 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs | 47 +++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs | 14 ++
14 files changed, 236 insertions(+), 11 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs
index 692357d..a8f4ccc 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
@@ -16,4 +17,34 @@
/// Gets or sets the name.
/// </summary>
public string Name { get; set; }
+
+ /// <summary>
+ /// 搴撳尯缂栧彿
+ /// </summary>
+ public string AreaNo { get; set; }
+
+ /// <summary>
+ /// 搴撳尯鍚嶇О
+ /// </summary>
+ public string AreaName { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public string? AreaDesc { get; set; }
+
+ /// <summary>
+ /// 搴撳尯鐘舵��
+ /// </summary>
+ public AreaStatusEnum AreaStatus { get; set; }
+
+ /// <summary>
+ /// 搴撳尯绫诲瀷
+ /// </summary>
+ public AreaTypeEnum AreaType { get; set; }
+
+ /// <summary>
+ /// 浠撳簱浠ｇ爜
+ /// </summary>
+ public string? StoreCode { get; set; }
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs
index c02f482..632c8e7 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs
@@ -69,4 +69,21 @@
public WmsAreaCreateOrUpdateDtoBase() : base(false)
{
}
+
+
+ /// <summary>
+ /// 搴撳尯鍒楄〃
+ /// </summary>
+ public class AreaForListOuptut
+ {
+ /// <summary>
+ /// 搴撳尯缂栧彿
+ /// </summary>
+ public string AreaNo { get; set; }
+
+ /// <summary>
+ /// 搴撳尯鍚嶇О
+ /// </summary>
+ public string AreaName { get; set; }
+ }
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs
index 3e149cc..9d5615c 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs
@@ -30,10 +30,31 @@
public AreaStatusEnum AreaStatus { get; set; }
/// <summary>
+ /// 搴撳尯鐘舵��
+ /// </summary>
+ public string AreaStatusDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(AreaStatus);
+ }
+ }
+
+ /// <summary>
/// 搴撳尯绫诲瀷
/// </summary>
public AreaTypeEnum AreaType { get; set; }
+ /// <summary>
+ /// 搴撳尯鐘舵��
+ /// </summary>
+ public string AreaTypeDesc
+ {
+ get
+ {
+ return GetEnumDescriptionUtil.GetEnumDescription(AreaType);
+ }
+ }
/// <summary>
/// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs
index e4859f6..314626d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs
@@ -68,3 +68,20 @@
return exportData;
}
}
+
+
+/// <summary>
+/// 鍋氫粨搴撻�夋嫨浣跨敤
+/// </summary>
+public class WmsStoreForAreaOutpur
+{
+ /// <summary>
+ /// 浠撳簱浠ｇ爜
+ /// </summary>
+ public string? StoreCode { get; set; }
+
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ public string? StoreName { get; set; }
+}
\ No newline at end of file
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
index f4ad031..7e6899f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
@@ -1,10 +1,12 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services
{
@@ -18,5 +20,17 @@
/// </summary>
/// <returns></returns>
List<EnumItem> GetEnumDataList(WmsEnumInput enumInput);
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ Task<List<WmsStoreForAreaOutpur>> GetStreList();
+
+ /// <summary>
+ /// 搴撳尯鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ Task<List<AreaForListOuptut>> GetAreaListAsync();
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
index b037ac9..e9c095e 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
@@ -7,6 +7,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
+using CMS.Plugin.HIAWms.Domain.Shared.Util;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -41,8 +42,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<GetWmsAreasInput, 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));
}
@@ -153,7 +155,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;
@@ -294,12 +296,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<GetWmsAreasInput, 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妯＄増";
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
index a3f4057..0c133ec 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
@@ -1,11 +1,15 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
+using CMS.Plugin.HIAWms.Domain.WmsAreas;
+using CMS.Plugin.HIAWms.Domain.WmsStores;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Application.Implements
{
@@ -14,9 +18,52 @@
/// </summary>
public class WmsEnumAppService : CMSPluginAppService, IWmsEnumAppService
{
+ private readonly IWmsStoreRepository _storeRepository;
+ private readonly IWmsAreaRepository _wmsAreaRepository;
+
+ public WmsEnumAppService(IWmsStoreRepository storeRepository, IWmsAreaRepository wmsAreaRepository)
+ {
+ _storeRepository = storeRepository;
+ _wmsAreaRepository = wmsAreaRepository;
+ }
+
public List<EnumItem> GetEnumDataList(WmsEnumInput enumInput)
{
return EnumHelper.GetEnumItems(enumInput.EnumName);
}
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public async Task<List<WmsStoreForAreaOutpur>> GetStreList()
+ {
+ var list = await _storeRepository.GetListForSelectAsync();
+ if (list == null || list.Count <= 0) { return new List<WmsStoreForAreaOutpur>(); }
+
+ var result = list.Select(x => new WmsStoreForAreaOutpur
+ {
+ StoreCode = x.StoreCode,
+ StoreName = x.StoreName,
+ }).ToList();
+ return result;
+ }
+
+ /// <summary>
+ /// 搴撳尯鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public async Task<List<AreaForListOuptut>> GetAreaListAsync()
+ {
+ var list = await _wmsAreaRepository.GetListForSelectAsync();
+ if (list == null || list.Count <= 0) { return new List<AreaForListOuptut>(); }
+ var result = list.Select(x=>new AreaForListOuptut
+ {
+ AreaName = x.AreaName,
+ AreaNo = x.AreaNo,
+ }).ToList();
+
+ return result;
+ }
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs
index 16dc174..ccf02e3 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs
@@ -21,5 +21,6 @@
* into multiple profile classes for a better organization. */
CreateMap<WmsArea, WmsAreaDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
CreateMap<WmsAreaCreateDto, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+ CreateMap<GetWmsAreasInput, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs
index 6695501..6bb3cce 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs
@@ -21,5 +21,6 @@
* into multiple profile classes for a better organization. */
CreateMap<WmsStore, WmsStoreDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
CreateMap<WmsStoreCreateDto, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+ CreateMap<GetWmsStoresInput, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs
index f034367..caacf37 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs
@@ -41,7 +41,14 @@
/// <param name="includeDetails">if set to <c>true</c> [include details].</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns></returns>
- Task<List<WmsArea>> GetListAsync(string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsArea> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
+ Task<List<WmsArea>> GetListAsync(WmsArea? area, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsArea> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
+
+ /// <summary>
+ /// 鑾峰彇搴撳尯鍒楄〃
+ /// </summary>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ Task<List<WmsArea>> GetListForSelectAsync(CancellationToken cancellationToken = default);
/// <summary>
/// Gets the count asynchronous.
@@ -50,5 +57,5 @@
/// <param name="specification">The specification.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns></returns>
- Task<long> GetCountAsync(string filter = null, Specification<WmsArea> specification = null, CancellationToken cancellationToken = default);
+ Task<long> GetCountAsync(WmsArea? area, string filter = null, Specification<WmsArea> specification = null, CancellationToken cancellationToken = default);
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs
index 8796ec5..e843235 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs
@@ -44,6 +44,13 @@
Task<List<WmsStore>> GetListAsync(WmsStore? store, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsStore> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
/// <summary>
+ /// 鏌ヨ浠撳簱鍒楄〃
+ /// </summary>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ Task<List<WmsStore>> GetListForSelectAsync(CancellationToken cancellationToken = default);
+
+ /// <summary>
/// Gets the count asynchronous.
/// </summary>
/// <param name="filter">The filter.</param>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
index 841bdba..64d4d26 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
@@ -1,6 +1,9 @@
+using System;
using System.Linq.Dynamic.Core;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
+using DatabaseSchemaReader.Filters;
+using MathNet.Numerics;
using Microsoft.EntityFrameworkCore;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
@@ -26,11 +29,11 @@
return await (await GetDbSetAsync())
.IncludeDetails()
.OrderBy(t => t.Sort)
- .Where(x=> !x.IsDeleted)
+ .Where(x => !x.IsDeleted)
.FirstOrDefaultAsync(t => t.AreaName == name, GetCancellationToken(cancellationToken));
}
-
+
/// <summary>
/// 查看库区是否存在
/// </summary>
@@ -59,26 +62,47 @@
}
/// <inheritdoc />
- public async Task<List<WmsArea>> GetListAsync(string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsArea> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
+ public async Task<List<WmsArea>> GetListAsync(WmsArea? area, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsArea> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
{
specification ??= new WmsAreaSpecification();
return await (await GetDbSetAsync())
.IncludeDetails(includeDetails)
.Where(specification.ToExpression())
.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.AreaNo.Contains(filter))
+ .WhereIf(!string.IsNullOrEmpty(area.AreaNo), u => u.AreaNo.Contains(area.AreaNo))
+ .WhereIf(!string.IsNullOrEmpty(area.AreaName), u => u.AreaNo.Contains(area.AreaName))
+ .WhereIf(!string.IsNullOrEmpty(area.StoreCode), u => u.AreaNo == area.StoreCode)
+ .WhereIf(area.AreaStatus > 0, u => u.AreaStatus == area.AreaStatus)
+ .WhereIf(area.AreaType > 0, u => u.AreaType == area.AreaType)
.Where(x => !x.IsDeleted)
.OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsArea.Sort) : sorting)
.PageBy(skipCount, maxResultCount)
.ToListAsync(GetCancellationToken(cancellationToken));
}
+ /// <summary>
+ /// 获取库区列表
+ /// </summary>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsArea>> GetListForSelectAsync(CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
/// <inheritdoc />
- public async Task<long> GetCountAsync(string filter = null, Specification<WmsArea> specification = null, CancellationToken cancellationToken = default)
+ public async Task<long> GetCountAsync(WmsArea? area, string filter = null, Specification<WmsArea> specification = null, CancellationToken cancellationToken = default)
{
specification ??= new WmsAreaSpecification();
return await (await GetQueryableAsync())
.Where(specification.ToExpression())
.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.AreaNo.Contains(filter))
+ .WhereIf(!string.IsNullOrEmpty(area.AreaNo), u => u.AreaNo.Contains(area.AreaNo))
+ .WhereIf(!string.IsNullOrEmpty(area.AreaName), u => u.AreaNo.Contains(area.AreaName))
+ .WhereIf(!string.IsNullOrEmpty(area.StoreCode), u => u.AreaNo == area.StoreCode)
+ .WhereIf(area.AreaStatus > 0, u => u.AreaStatus == area.AreaStatus)
+ .WhereIf(area.AreaType > 0, u => u.AreaType == area.AreaType)
.Where(x => !x.IsDeleted)
.CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs
index cbfdde4..5895908 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs
@@ -67,6 +67,17 @@
.ToListAsync(GetCancellationToken(cancellationToken));
}
+ /// <summary>
+ /// 查询仓库列表
+ /// </summary>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsStore>> GetListForSelectAsync( CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
/// <inheritdoc />
public async Task<long> GetCountAsync(WmsStore? store, string filter = null, Specification<WmsStore> specification = null, CancellationToken cancellationToken = default)
{
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
index dc0295b..021aa9d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
@@ -1,10 +1,12 @@
锘縰sing CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Web;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Controller
{
@@ -41,5 +43,27 @@
{
return _wmsEnumAppService.GetEnumDataList(input);
}
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("StoreList")]
+ public async Task<List<WmsStoreForAreaOutpur>> GetStreList()
+ {
+ return await _wmsEnumAppService.GetStreList();
+ }
+
+ /// <summary>
+ /// 搴撳尯鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("AreaList")]
+ public async Task<List<AreaForListOuptut>> GetAreaListAsync()
+ {
+ return await _wmsEnumAppService.GetAreaListAsync();
+ }
}
}
--
Gitblit v1.9.3