From a13600c7d96cfc18d2b5b9aa976bf1cc8dbb711d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 07:13:06 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 208 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 145 insertions(+), 63 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/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 c70214a..6e207c7 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"
@@ -1,9 +1,11 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials;
-using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
+using CMS.Plugin.HIAWms.Domain.WmsMaterial;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -12,7 +14,9 @@
namespace CMS.Plugin.HIAWms.Application.Implements;
-/// <inheritdoc />
+/// <summary>
+/// 鐗╂枡鍩虹淇℃伅搴旂敤鏈嶅姟
+/// </summary>
public class WmsMaterialAppService : CMSPluginAppService, IWmsMaterialAppService
{
private readonly IWmsMaterialRepository _wmsmaterialRepository;
@@ -26,14 +30,22 @@
_wmsmaterialRepository = wmsmaterialRepository;
}
- /// <inheritdoc />
+ /// <summary>
+ /// 鑾峰彇鎸囧畾鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
public virtual async Task<WmsMaterialDto> GetAsync(Guid id)
{
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await _wmsmaterialRepository.GetAsync(id));
}
- /// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialsInput input)
+ /// <summary>
+ /// 鍒嗛〉鑾峰彇鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input)
{
Check.NotNull(input, nameof(input));
@@ -42,16 +54,48 @@
input.Sorting = nameof(WmsMaterial.Sort);
}
- var specification = new WmsMaterialSpecification(input.Name);
- var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
- var count = await _wmsmaterialRepository.GetCountAsync(material,input.Filter, specification);
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await _wmsmaterialRepository.GetCountAsync(whereConditions);
+ var list = await _wmsmaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
}
- /// <inheritdoc />
+ /// <summary>
+ /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ /// </summary>
+ /// <param name="input">杈撳叆鍙傛暟</param>
+ /// <returns></returns>
+ private FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> DynamicGetQueryParams(GetWmsMaterialInput input)
+ {
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterial, GetWmsMaterialInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
+ //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
+ Expression<Func<WmsMaterial, bool>> extendExpression = a => a.IsDeleted == false;
+ // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
+ var pres = (System.Linq.Expressions.Expression<Func<WmsMaterial, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
+ }
+
+ /// <summary>
+ /// 鏂板缓鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
public virtual async Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
{
await CheckCreateOrUpdateDtoAsync(input);
@@ -79,7 +123,13 @@
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
}
- /// <inheritdoc />
+ /// <summary>
+ /// 鏇存柊鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="id"></param>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
public virtual async Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
{
await CheckCreateOrUpdateDtoAsync(input);
@@ -112,7 +162,11 @@
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
}
- /// <inheritdoc />
+ /// <summary>
+ /// 鍏嬮殕鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids)
{
//var wmsmaterials = new List<WmsMaterial>();
@@ -148,13 +202,21 @@
return new List<WmsMaterialDto>();
}
- /// <inheritdoc />
+ /// <summary>
+ /// 鍒犻櫎鍗曚釜鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
public virtual Task DeleteAsync(Guid id)
{
return _wmsmaterialRepository.DeleteAsync(id);
}
- /// <inheritdoc />
+ /// <summary>
+ /// 鍒犻櫎澶氫釜鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
public async Task DeleteManyAsync(IEnumerable<Guid> ids)
{
foreach (var id in ids)
@@ -163,7 +225,12 @@
}
}
- /// <inheritdoc />
+ /// <summary>
+ /// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="id"></param>
+ /// <param name="sort"></param>
+ /// <returns></returns>
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
var list = await _wmsmaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
@@ -196,21 +263,26 @@
await _wmsmaterialRepository.UpdateManyAsync(list);
}
- /// <inheritdoc />
+ /// <summary>
+ /// 瀵煎叆鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
public async Task ImportAsync(WmsMaterialsImportModel input)
{
Check.NotNull(input, nameof(input));
var wmsmaterialCreateDtos = new List<(int RowIndex, WmsMaterialCreateDto Item)>();
var wmsmaterialUpdateDtos = new List<(int RowIndex, Guid Id, WmsMaterialUpdateDto Item)>();
- var wmsmaterials = input.WmsMaterials;
+ var importItems = input.WmsMaterials;
- if (wmsmaterials != null && wmsmaterials.Any())
+ if (importItems != null && importItems.Any())
{
#region 瀵煎叆鏍￠獙
// 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsMaterials = wmsmaterials.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
+ var duplicateWmsMaterials = importItems.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
if (duplicateWmsMaterials?.Any() == true)
{
var duplicateWmsMaterialMsgs = duplicateWmsMaterials.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
@@ -220,63 +292,63 @@
#endregion
- foreach (var wmsmaterial in wmsmaterials)
+ foreach (var impItem in importItems)
{
- if (wmsmaterial.MaterialCode.IsNullOrWhiteSpace() && wmsmaterial.MaterialName.IsNullOrWhiteSpace())
+ if (impItem.MaterialCode.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
{
continue;
}
- if (wmsmaterial.MaterialCode.IsNullOrWhiteSpace())
+ if (impItem.MaterialCode.IsNullOrWhiteSpace())
{
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsmaterial.RowIndex}琛岋細WmsMaterial鍚嶇О涓嶈兘涓虹┖";
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsMaterial鍚嶇О涓嶈兘涓虹┖";
throw new UserFriendlyException(errorMsg);
}
- var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(wmsmaterial.MaterialCode);
+ var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(impItem.MaterialCode);
if (oldWmsMaterial != null)
{
var wmsmaterialUpdateDto = new WmsMaterialUpdateDto
{
- MaterialCode = wmsmaterial.MaterialCode,
- MaterialName = wmsmaterial.MaterialName,
- PurchaseType = wmsmaterial.PurchaseType,
- MaterialType = wmsmaterial.MaterialType,
- PrimaryUnit = wmsmaterial.PrimaryUnit,
- Standard = wmsmaterial.Standard,
- OuterDiameter = wmsmaterial.OuterDiameter,
- WallThickness = wmsmaterial.WallThickness,
- MaterialQuality = wmsmaterial.MaterialQuality,
- Length = wmsmaterial.Length,
- IsMainBranch = wmsmaterial.IsMainBranch,
- Factory = wmsmaterial.Factory,
- Certification = wmsmaterial.Certification,
- Remark = wmsmaterial.Remark,
+ MaterialCode = impItem.MaterialCode,
+ MaterialName = impItem.MaterialName,
+ PurchaseType = impItem.PurchaseType,
+ MaterialType = impItem.MaterialType,
+ PrimaryUnit = impItem.PrimaryUnit,
+ Standard = impItem.Standard,
+ OuterDiameter = impItem.OuterDiameter,
+ WallThickness = impItem.WallThickness,
+ MaterialQuality = impItem.MaterialQuality,
+ Length = impItem.Length,
+ IsMainBranch = impItem.IsMainBranch,
+ Factory = impItem.Factory,
+ Certification = impItem.Certification,
+ Remark = impItem.Remark,
};
- wmsmaterialUpdateDtos.Add((wmsmaterial.RowIndex, oldWmsMaterial.Id, wmsmaterialUpdateDto));
+ wmsmaterialUpdateDtos.Add((impItem.RowIndex, oldWmsMaterial.Id, wmsmaterialUpdateDto));
}
else
{
var wmsmaterialCreateDto = new WmsMaterialCreateDto
{
- MaterialCode = wmsmaterial.MaterialCode,
- MaterialName = wmsmaterial.MaterialName,
- PurchaseType = wmsmaterial.PurchaseType,
- MaterialType = wmsmaterial.MaterialType,
- PrimaryUnit = wmsmaterial.PrimaryUnit,
- Standard = wmsmaterial.Standard,
- OuterDiameter = wmsmaterial.OuterDiameter,
- WallThickness = wmsmaterial.WallThickness,
- MaterialQuality = wmsmaterial.MaterialQuality,
- Length = wmsmaterial.Length,
- IsMainBranch = wmsmaterial.IsMainBranch,
- Factory = wmsmaterial.Factory,
- Certification = wmsmaterial.Certification,
- Remark = wmsmaterial.Remark,
+ MaterialCode = impItem.MaterialCode,
+ MaterialName = impItem.MaterialName,
+ PurchaseType = impItem.PurchaseType,
+ MaterialType = impItem.MaterialType,
+ PrimaryUnit = impItem.PrimaryUnit,
+ Standard = impItem.Standard,
+ OuterDiameter = impItem.OuterDiameter,
+ WallThickness = impItem.WallThickness,
+ MaterialQuality = impItem.MaterialQuality,
+ Length = impItem.Length,
+ IsMainBranch = impItem.IsMainBranch,
+ Factory = impItem.Factory,
+ Certification = impItem.Certification,
+ Remark = impItem.Remark,
};
- wmsmaterialCreateDtos.Add((wmsmaterial.RowIndex, wmsmaterialCreateDto));
+ wmsmaterialCreateDtos.Add((impItem.RowIndex, wmsmaterialCreateDto));
}
}
}
@@ -310,8 +382,12 @@
}
}
- /// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialsInput input)
+ /// <summary>
+ /// 瀵煎嚭鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input)
{
Check.NotNull(input, nameof(input));
@@ -320,10 +396,15 @@
input.Sorting = nameof(WmsMaterial.Sort);
}
- var specification = new WmsMaterialSpecification(input.Name);
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
- var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ var list = await _wmsmaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);
var sheets = new Dictionary<string, object>
@@ -336,9 +417,10 @@
}
/// <summary>
- /// Checks the create or update dto asynchronous.
+ /// 鏍￠獙鐗╂枡鍩虹淇℃伅锛屽綋鏂板缓鎴栨洿鏂版椂
/// </summary>
- /// <param name="input">The input.</param>
+ /// <param name="input"></param>
+ /// <returns></returns>
protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialCreateOrUpdateDtoBase input)
{
Check.NotNull(input, nameof(input));
--
Gitblit v1.9.3