From 704950daf7df2add26bcec4268c67de79e8f5905 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 17:54:55 +0800
Subject: [PATCH] 托盘号
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 28 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
index c44b1ae..926d105 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/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.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -33,7 +35,7 @@
}
/// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialsInput input)
+ public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input)
{
Check.NotNull(input, nameof(input));
@@ -42,13 +44,40 @@
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));
+ }
+
+ /// <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;
}
/// <inheritdoc />
@@ -56,10 +85,10 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialCode);
+ var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialNo);
if (exist)
{
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
}
var maxSort = await _wmsmaterialRepository.GetMaxSortAsync();
@@ -85,10 +114,10 @@
await CheckCreateOrUpdateDtoAsync(input);
var wmsmaterial = await _wmsmaterialRepository.GetAsync(id);
- var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialCode, wmsmaterial.Id);
+ var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialNo, wmsmaterial.Id);
if (exist)
{
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
}
wmsmaterial.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
@@ -96,7 +125,7 @@
wmsmaterial.MaterialName = input.MaterialName;
wmsmaterial.PurchaseType = input.PurchaseType;
- wmsmaterial.MaterialType = input.MaterialType;
+ wmsmaterial.MaterialTypeCode = input.MaterialTypeCode;
wmsmaterial.PrimaryUnit = input.PrimaryUnit;
wmsmaterial.Standard = input.Standard;
wmsmaterial.OuterDiameter = input.OuterDiameter;
@@ -107,7 +136,7 @@
wmsmaterial.Factory = input.Factory;
wmsmaterial.MaterialModel = input.MaterialModel;
wmsmaterial.Certification = input.Certification;
-
+ wmsmaterial.MaterialTypeDesc = input.MaterialTypeDesc;
await _wmsmaterialRepository.UpdateAsync(wmsmaterial);
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
@@ -198,7 +227,7 @@
}
/// <inheritdoc />
- public async Task ImportAsync(WmsMaterialsImportModel input)
+ public async Task ImportAsync(WmsMaterialImportModels input)
{
Check.NotNull(input, nameof(input));
@@ -211,7 +240,7 @@
#region 瀵煎叆鏍￠獙
// 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsMaterials = wmsmaterials.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
+ var duplicateWmsMaterials = wmsmaterials.GroupBy(x => x.MaterialNo).Where(x => x.Count() > 1).ToList();
if (duplicateWmsMaterials?.Any() == true)
{
var duplicateWmsMaterialMsgs = duplicateWmsMaterials.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
@@ -223,26 +252,27 @@
foreach (var wmsmaterial in wmsmaterials)
{
- if (wmsmaterial.MaterialCode.IsNullOrWhiteSpace() && wmsmaterial.MaterialName.IsNullOrWhiteSpace())
+ if (wmsmaterial.MaterialNo.IsNullOrWhiteSpace() && wmsmaterial.MaterialName.IsNullOrWhiteSpace())
{
continue;
}
- if (wmsmaterial.MaterialCode.IsNullOrWhiteSpace())
+ if (wmsmaterial.MaterialNo.IsNullOrWhiteSpace())
{
var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsmaterial.RowIndex}琛岋細WmsMaterial鍚嶇О涓嶈兘涓虹┖";
throw new UserFriendlyException(errorMsg);
}
- var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(wmsmaterial.MaterialCode);
+ var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(wmsmaterial.MaterialNo);
if (oldWmsMaterial != null)
{
var wmsmaterialUpdateDto = new WmsMaterialUpdateDto
{
- MaterialCode = wmsmaterial.MaterialCode,
+ MaterialNo = wmsmaterial.MaterialNo,
MaterialName = wmsmaterial.MaterialName,
PurchaseType = wmsmaterial.PurchaseType,
- MaterialType = wmsmaterial.MaterialType,
+ MaterialTypeCode = wmsmaterial.MaterialTypeCode,
+ MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
PrimaryUnit = wmsmaterial.PrimaryUnit,
Standard = wmsmaterial.Standard,
OuterDiameter = wmsmaterial.OuterDiameter,
@@ -261,10 +291,11 @@
{
var wmsmaterialCreateDto = new WmsMaterialCreateDto
{
- MaterialCode = wmsmaterial.MaterialCode,
+ MaterialNo = wmsmaterial.MaterialNo,
MaterialName = wmsmaterial.MaterialName,
PurchaseType = wmsmaterial.PurchaseType,
- MaterialType = wmsmaterial.MaterialType,
+ MaterialTypeCode = wmsmaterial.MaterialTypeCode,
+ MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
PrimaryUnit = wmsmaterial.PrimaryUnit,
Standard = wmsmaterial.Standard,
OuterDiameter = wmsmaterial.OuterDiameter,
@@ -311,8 +342,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));
@@ -321,10 +356,16 @@
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>
@@ -332,7 +373,7 @@
["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "WmsMaterial鍒楄〃" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = "鐗╂枡鍩虹";
return (sheets, fileName);
}
@@ -343,7 +384,7 @@
protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialCreateOrUpdateDtoBase input)
{
Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.MaterialCode, "缂栧彿", WmsMaterialConsts.MaxCodeLength);
+ Check.NotNullOrWhiteSpace(input.MaterialNo, "缂栧彿", WmsMaterialConsts.MaxCodeLength);
Check.NotNullOrWhiteSpace(input.MaterialName, "鍚嶇О", WmsMaterialConsts.MaxNameLength);
Check.Length(input.Remark, "澶囨敞", WmsMaterialConsts.MaxRemarkLength);
return Task.CompletedTask;
--
Gitblit v1.9.3