From 175778137478488ba346f083ed3d6cdc55256419 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 17:49:51 +0800
Subject: [PATCH] 22

---
 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 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 10c209b..cc36680 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs
@@ -1,6 +1,7 @@
 using System.Linq.Dynamic.Core;
 using CMS.Plugin.HIAWms.Domain.WmsPlaces;
 using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
@@ -25,6 +26,7 @@
     {
         return await (await GetDbSetAsync())
             .IncludeDetails()
+            .Where(x => !x.IsDeleted)
             .OrderBy(t => t.Sort)
             .FirstOrDefaultAsync(t => t.PlaceNo == name, GetCancellationToken(cancellationToken));
     }
@@ -32,41 +34,63 @@
     /// <inheritdoc />
     public async Task<bool> NameExistAsync(string name, Guid? id = null)
     {
-        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).AnyAsync(x => x.PlaceNo == name);
+        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.PlaceNo == name);
     }
 
     /// <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<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)
+    public async Task<List<WmsPlace>> GetListAsync(WmsPlace? place, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsPlace> specification = null, 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(!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)
             .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsPlace.Sort) : sorting)
             .PageBy(skipCount, maxResultCount)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
     /// <inheritdoc />
-    public async Task<long> GetCountAsync(string filter = null, Specification<WmsPlace> specification = null, CancellationToken cancellationToken = default)
+    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));
     }
@@ -74,6 +98,7 @@
     /// <inheritdoc />
     public override async Task<IQueryable<WmsPlace>> WithDetailsAsync()
     {
-        return (await GetQueryableAsync()).IncludeDetails();
+        return (await GetQueryableAsync())
+            .Where(x => !x.IsDeleted).IncludeDetails();
     }
 }

--
Gitblit v1.9.3