From 505a15c0e864d12b13ab639e8e2f5984763aac49 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 14 5月 2025 11:44:40 +0800 Subject: [PATCH] 修改命名空间 --- HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs index cc36680..dc5cf40 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs @@ -1,4 +1,6 @@ using System.Linq.Dynamic.Core; +using CMS.Plugin.HIAWms.Domain.Shared.Enums; +using CMS.Plugin.HIAWms.Domain.WmsAreas; using CMS.Plugin.HIAWms.Domain.WmsPlaces; using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions; using Microsoft.AspNetCore.Components.Forms; @@ -60,7 +62,7 @@ .IncludeDetails(includeDetails) .Where(specification.ToExpression()) .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.PlaceNo.Contains(filter)) - .WhereIf(!string.IsNullOrEmpty(place.PlaceNo), u => u.PlaceNo == place.PlaceNo) + .WhereIf(!string.IsNullOrEmpty(place.PlaceNo), u => u.PlaceNo.Contains(place.PlaceNo)) .WhereIf(place.PlaceStatus > 0, u => u.PlaceStatus == place.PlaceStatus) .WhereIf(place.StorageTypeNo > 0, u => u.StorageTypeNo == place.StorageTypeNo) .WhereIf(place.Aisle > 0, u => u.Aisle == place.Aisle) @@ -74,6 +76,19 @@ .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } + + + /// <summary> + /// 获取巷道列表 + /// </summary> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<List<WmsPlace>> GetAisleListForSelectAsync(CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()).Where(x => !x.IsDeleted) + .ToListAsync(GetCancellationToken(cancellationToken)); + } + /// <inheritdoc /> public async Task<long> GetCountAsync(WmsPlace? place, string filter = null, Specification<WmsPlace> specification = null, CancellationToken cancellationToken = default) @@ -101,4 +116,17 @@ return (await GetQueryableAsync()) .Where(x => !x.IsDeleted).IncludeDetails(); } + + /// <summary> + /// 获取库区列表 + /// </summary> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<List<WmsPlace>> GetPlaceListForSelectAsync(PlaceTypeEnum placeType,CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .Where(x => !x.IsDeleted) + .Where(x=>x.StorageTypeNo == placeType) + .ToListAsync(GetCancellationToken(cancellationToken)); + } } -- Gitblit v1.9.3