From 3aedad63dd01f1fc5154cb520af32edab967d6e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 09:15:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 49 insertions(+), 2 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..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,6 +1,9 @@
 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;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
@@ -52,25 +55,56 @@
     }
 
     /// <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.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)
+            .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));
     }
 
+
+    /// <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(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));
@@ -82,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