From 0695df2cbdf332072150d3dad31c687f6fe90b1d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 06:40:11 +0800
Subject: [PATCH] 去掉 规约查询
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterialSpecification.cs | 70 +++++++++++-----------
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs | 4 -
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 10 +--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs | 20 +++---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs | 20 +-----
5 files changed, 52 insertions(+), 72 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs"
index a72053f..ae8bcc8 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs"
@@ -9,10 +9,6 @@
/// </summary>
public class GetWmsMaterialsInput : ExtensiblePagedAndSortedResultRequestDto
{
- ///// <summary>
- ///// Gets or sets the filter.
- ///// </summary>
- //public string Filter { get; set; }
#region 鍏抽敭瀛楁煡璇�
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
index a9b0b6d..94f10b2 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
@@ -51,11 +51,10 @@
#endregion
- var specification = new WmsMaterialSpecification(input.Name);
var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
- var count = await _wmsmaterialRepository.GetCountAsync(material, whereConditions, specification);
+ var count = await _wmsmaterialRepository.GetCountAsync(material, whereConditions);
- var list = await _wmsmaterialRepository.GetListAsync(material, whereConditions,input.Sorting, input.MaxResultCount, input.SkipCount, specification);
+ var list = await _wmsmaterialRepository.GetListAsync(material, whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
}
@@ -197,7 +196,7 @@
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmsmaterialRepository.GetListAsync(null,null, nameof(WmsMaterial.Sort));
+ var list = await _wmsmaterialRepository.GetListAsync(null, null, nameof(WmsMaterial.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -358,10 +357,9 @@
#endregion
- var specification = new WmsMaterialSpecification(input.Name);
var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
- var list = await _wmsmaterialRepository.GetListAsync(material, whereConditions,input.Sorting, input.MaxResultCount, input.SkipCount, specification, includeDetails: true);
+ var list = await _wmsmaterialRepository.GetListAsync(material, whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);
var sheets = new Dictionary<string, object>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs"
index 00228b5..6a53916 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs"
@@ -33,17 +33,17 @@
Task<int> GetMaxSortAsync();
/// <summary>
- /// Gets the list asynchronous.
+ /// Gets the list asynchronous
/// </summary>
- /// <param name="sorting">The sorting.</param>
- /// <param name="maxResultCount">The maximum result count.</param>
- /// <param name="skipCount">The skip count.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="includeDetails">if set to <c>true</c> [include details].</param>
- /// <param name="cancellationToken">The cancellation token.</param>
+ /// <param name="material"></param>
+ /// <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>
- Task<List<WmsMaterial>> GetListAsync(WmsMaterial material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, Specification<WmsMaterial> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
+ Task<List<WmsMaterial>> GetListAsync(WmsMaterial material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default);
/// <summary>
/// Gets the count asynchronous.
@@ -52,5 +52,5 @@
/// <param name="specification">The specification.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns></returns>
- Task<long> GetCountAsync(WmsMaterial material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, Specification<WmsMaterial> specification = null, CancellationToken cancellationToken = default);
+ Task<long> GetCountAsync(WmsMaterial material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default);
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterialSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterialSpecification.cs"
index 1af79b7..10e3999 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterialSpecification.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterialSpecification.cs"
@@ -1,41 +1,41 @@
-using System.Linq.Expressions;
+//using System.Linq.Expressions;
-namespace CMS.Plugin.HIAWms.Domain.WmsMaterials
-{
- /// <summary>
- /// WmsMaterial瑙勭害
- /// </summary>
- public class WmsMaterialSpecification : Volo.Abp.Specifications.Specification<WmsMaterial>
- {
- private readonly string _materialCode;
+//namespace CMS.Plugin.HIAWms.Domain.WmsMaterials
+//{
+// /// <summary>
+// /// WmsMaterial瑙勭害
+// /// </summary>
+// public class WmsMaterialSpecification : Volo.Abp.Specifications.Specification<WmsMaterial>
+// {
+// private readonly string _materialCode;
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialSpecification"/> class.
- /// </summary>
- public WmsMaterialSpecification()
- {
- }
+// /// <summary>
+// /// Initializes a new instance of the <see cref="WmsMaterialSpecification"/> class.
+// /// </summary>
+// public WmsMaterialSpecification()
+// {
+// }
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialSpecification"/> class.
- /// </summary>
- /// <param name="materialCode">The name.</param>
- public WmsMaterialSpecification(string materialCode = null)
- {
- _materialCode = materialCode;
- }
+// /// <summary>
+// /// Initializes a new instance of the <see cref="WmsMaterialSpecification"/> class.
+// /// </summary>
+// /// <param name="materialCode">The name.</param>
+// public WmsMaterialSpecification(string materialCode = null)
+// {
+// _materialCode = materialCode;
+// }
- /// <inheritdoc />
- public override Expression<Func<WmsMaterial, bool>> ToExpression()
- {
- Expression<Func<WmsMaterial, bool>> expression = c => 1 == 1;
+// /// <inheritdoc />
+// public override Expression<Func<WmsMaterial, bool>> ToExpression()
+// {
+// Expression<Func<WmsMaterial, bool>> expression = c => 1 == 1;
- if (_materialCode != null)
- {
- expression = expression.And(c => c.MaterialCode == _materialCode);
- }
+// if (_materialCode != null)
+// {
+// expression = expression.And(c => c.MaterialCode == _materialCode);
+// }
- return expression;
- }
- }
-}
+// return expression;
+// }
+// }
+//}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs"
index 0bbd4c5..7f98b24 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs"
@@ -57,18 +57,11 @@
}
/// <inheritdoc />
- public async Task<List<WmsMaterial>> GetListAsync(WmsMaterial? material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, Specification<WmsMaterial> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
+ public async Task<List<WmsMaterial>> GetListAsync(WmsMaterial? material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
{
- specification ??= new WmsMaterialSpecification();
return await (await GetDbSetAsync())
.IncludeDetails(includeDetails)
- .Where(specification.ToExpression())
.WhereIf(whereConditions != null, whereConditions.data)
- //.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.MaterialCode.Contains(filter))
- //.WhereIf(!string.IsNullOrEmpty(material.MaterialName), u => u.MaterialName.Contains(material.MaterialName))
- //.WhereIf(!string.IsNullOrEmpty(material.MaterialCode), u => u.MaterialName.Contains(material.MaterialCode))
- //.WhereIf(material.MaterialType > 0, u => u.MaterialType == material.MaterialType)
- //.WhereIf(material.PurchaseType > 0, u => u.PurchaseType == material.PurchaseType)
.Where(x => !x.IsDeleted)
.OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting)
.PageBy(skipCount, maxResultCount)
@@ -83,22 +76,15 @@
/// <param name="specification"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<long> GetCountAsync(WmsMaterial? material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, Specification<WmsMaterial> specification = null, CancellationToken cancellationToken = default)
+ public async Task<long> GetCountAsync(WmsMaterial? material, FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default)
{
- specification ??= new WmsMaterialSpecification();
return await (await GetQueryableAsync())
- .Where(specification.ToExpression())
.WhereIf(whereConditions != null, whereConditions.data)
- //.WhereIf(!string.IsNullOrEmpty(material.MaterialName), u => u.MaterialName.Contains(material.MaterialName))
- //.WhereIf(!string.IsNullOrEmpty(material.MaterialCode), u => u.MaterialName.Contains(material.MaterialCode))
- //.WhereIf(material.MaterialType > 0, u => u.MaterialType == material.MaterialType)
- //.WhereIf(material.PurchaseType > 0, u => u.PurchaseType == material.PurchaseType)
.Where(x => !x.IsDeleted)
- //.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.MaterialCode.Contains(filter))
.CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
}
-
+
/// <inheritdoc />
public override async Task<IQueryable<WmsMaterial>> WithDetailsAsync()
{
--
Gitblit v1.9.3