From 98749f73549cbbb1eb1db0916f3f2073e006384e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 30 4月 2025 19:47:32 +0800
Subject: [PATCH] 托盘管理
---
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 dc4e77a..f42bc56 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs
@@ -50,8 +50,19 @@
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())
@@ -59,18 +70,31 @@
.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));
}
--
Gitblit v1.9.3