From 8fbcbc9c365e911b561d17834f8e350974ca1439 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 12:43:13 +0800
Subject: [PATCH] 22
---
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs | 138 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 126 insertions(+), 12 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 31452c7..dac4c26 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs
@@ -1,7 +1,13 @@
-using System.Linq.Dynamic.Core;
+锘縰sing System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
+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 CmsQueryExtensions.Extension;
+using Microsoft.AspNetCore.Components.Forms;
using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Specifications;
@@ -51,30 +57,73 @@
return sort + 1;
}
- /// <inheritdoc />
- public async Task<List<WmsPlace>> GetListAsync(string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsPlace> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
+ /// <summary>
+ /// 鑾峰彇鍒嗛〉鍒楄〃搴撲綅淇℃伅
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="sorting"></param>
+ /// <param name="maxResultCount"></param>
+ /// <param name="skipCount"></param>
+ /// <param name="includeDetails"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsPlace>> GetListAsync(FunReturnResultModel<Expression<Func<WmsPlace, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
{
- specification ??= new WmsPlaceSpecification();
return await (await GetDbSetAsync())
.IncludeDetails(includeDetails)
- .Where(specification.ToExpression())
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.PlaceNo.Contains(filter))
+ .WhereIf(whereConditions != null, whereConditions.data)
.Where(x => !x.IsDeleted)
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsPlace.Sort) : sorting)
+ .OrderByDescending(x => x.CreationTime)
.PageBy(skipCount, maxResultCount)
.ToListAsync(GetCancellationToken(cancellationToken));
}
- /// <inheritdoc />
- public async Task<long> GetCountAsync(string filter = null, Specification<WmsPlace> specification = null, CancellationToken cancellationToken = default)
+ /// <summary>
+ /// 鑾峰彇鎬绘暟搴撲綅淇℃伅
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsPlace, bool>>> whereConditions, CancellationToken cancellationToken = default)
{
- specification ??= new WmsPlaceSpecification();
return await (await GetQueryableAsync())
- .Where(specification.ToExpression())
+ .WhereIf(whereConditions != null, whereConditions.data)
.Where(x => !x.IsDeleted)
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.PlaceNo.Contains(filter))
.CountAsync(cancellationToken: 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)
+ //{
+ // specification ??= new WmsPlaceSpecification();
+ // return await (await GetQueryableAsync())
+ // .Where(specification.ToExpression())
+ // .WhereIf(!string.IsNullOrEmpty(place.PlaceNo), u => u.PlaceNo == 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)
+ // .WhereIf(place.RowNo > 0, u => u.RowNo == place.RowNo)
+ // .WhereIf(place.ColumnNo > 0, u => u.ColumnNo == place.ColumnNo)
+ // .WhereIf(place.LayerNo > 0, u => u.LayerNo == place.LayerNo)
+ // .WhereIf(place.Islock > 0, u => u.Islock == place.Islock)
+ // .WhereIf(place.EmptyContainer > 0, u => u.EmptyContainer == place.EmptyContainer)
+ // .Where(x => !x.IsDeleted)
+ // .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.PlaceNo.Contains(filter))
+ // .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
+ //}
/// <inheritdoc />
public override async Task<IQueryable<WmsPlace>> WithDetailsAsync()
@@ -82,4 +131,69 @@
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));
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇搴撲綅淇℃伅鍒楄〃
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsPlace>> GetListByFilterAsync(Expression<Func<WmsPlace, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .IncludeDetails()
+ .WhereIf(whereConditions != null, whereConditions)
+ .Where(x => !x.IsDeleted)
+ .OrderByDescending(x => x.CreationTime)
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜搴撲綅淇℃伅
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
+ public async Task<WmsPlace> GetSingleByFilterAsync(Expression<Func<WmsPlace, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
+ {
+ if (is鈥婱ultipleThrowException)
+ {
+ var entitys = await (await GetDbSetAsync())
+ .IncludeDetails()
+ .WhereIf(whereConditions != null, whereConditions)
+ .Where(x => !x.IsDeleted)
+ .OrderByDescending(x => x.CreationTime)
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ if (entitys?.Count > 1)
+ {
+ throw new UserFriendlyException("鏌ヨ鍒板鏉¤褰�");
+ }
+ return entitys?.FirstOrDefault();
+ }
+ else
+ {
+ return await (await GetDbSetAsync())
+ .IncludeDetails()
+ .WhereIf(whereConditions != null, whereConditions)
+ .Where(x => !x.IsDeleted)
+ .OrderByDescending(x => x.CreationTime)
+ .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
+ }
+ }
+
}
--
Gitblit v1.9.3