From 251ac55b56c0ac330229cc217332e8d92381a69a Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 11:45:23 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs
index 06c876d..f42bc56 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs
@@ -25,6 +25,7 @@
{
return await (await GetDbSetAsync())
.IncludeDetails()
+ .Where(x => !x.IsDeleted)
.OrderBy(t => t.Sort)
.FirstOrDefaultAsync(t => t.ContainerNo == containerNo, GetCancellationToken(cancellationToken));
}
@@ -32,41 +33,68 @@
/// <inheritdoc />
public async Task<bool> NameExistAsync(string containerNo, Guid? id = null)
{
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).AnyAsync(x => x.ContainerNo == containerNo);
+ return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.ContainerNo == containerNo);
}
/// <inheritdoc />
public async Task<int> GetMaxSortAsync()
{
- var hasAny = await (await GetQueryableAsync()).AnyAsync();
+ var hasAny = await (await GetQueryableAsync()).Where(x => !x.IsDeleted).AnyAsync();
if (!hasAny)
{
return 1;
}
- var sort = await (await GetQueryableAsync()).MaxAsync(x => x.Sort);
+ var sort = await (await GetQueryableAsync())
+ .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
return sort + 1;
}
- /// <inheritdoc />
- public async Task<List<WmsContainer>> GetListAsync(string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsContainer> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
+ /// <summary>
+ /// 查询列表
+ /// </summary>
+ /// <param name="container"></param>
+ /// <param name="sorting"></param>
+ /// <param name="maxResultCount"></param>
+ /// <param name="skipCount"></param>
+ /// <param name="filter"></param>
+ /// <param name="specification"></param>
+ /// <param name="includeDetails"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsContainer>> GetListAsync(WmsContainer? container,string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsContainer> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
{
specification ??= new WmsContainerSpecification();
return await (await GetDbSetAsync())
.IncludeDetails(includeDetails)
.Where(specification.ToExpression())
+ .Where(x => !x.IsDeleted)
.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.ContainerNo.Contains(filter))
+ .WhereIf(!string.IsNullOrEmpty(container.ContainerNo),u=>u.ContainerNo.Contains(container.ContainerNo))
+ .WhereIf(container.ContainerStatus>0, u=>u.ContainerStatus == u.ContainerStatus)
+ .WhereIf(container.ContainerType>0, u=>u.ContainerType == u.ContainerType)
.OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsContainer.Sort) : sorting)
.PageBy(skipCount, maxResultCount)
.ToListAsync(GetCancellationToken(cancellationToken));
}
- /// <inheritdoc />
- public async Task<long> GetCountAsync(string filter = null, Specification<WmsContainer> specification = null, CancellationToken cancellationToken = default)
+ /// <summary>
+ /// 查询数量
+ /// </summary>
+ /// <param name="container"></param>
+ /// <param name="filter"></param>
+ /// <param name="specification"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<long> GetCountAsync(WmsContainer? container, string filter = null, Specification<WmsContainer> specification = null, CancellationToken cancellationToken = default)
{
specification ??= new WmsContainerSpecification();
return await (await GetQueryableAsync())
.Where(specification.ToExpression())
+ .Where(x => !x.IsDeleted)
+ .WhereIf(!string.IsNullOrEmpty(container.ContainerNo), u => u.ContainerNo.Contains(container.ContainerNo))
+ .WhereIf(container.ContainerStatus > 0, u => u.ContainerStatus == u.ContainerStatus)
+ .WhereIf(container.ContainerType > 0, u => u.ContainerType == u.ContainerType)
.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.ContainerNo.Contains(filter))
.CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
}
@@ -74,6 +102,6 @@
/// <inheritdoc />
public override async Task<IQueryable<WmsContainer>> WithDetailsAsync()
{
- return (await GetQueryableAsync()).IncludeDetails();
+ return (await GetQueryableAsync()).Where(x => !x.IsDeleted).IncludeDetails();
}
}
--
Gitblit v1.9.3