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.Application/Implements/WmsMaterialAppService.cs | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 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 1fbe564..6341792 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -1,12 +1,14 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CmsQueryExtensions;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -41,8 +43,10 @@
}
var specification = new WmsMaterialSpecification(input.Name);
- var count = await _wmsmaterialRepository.GetCountAsync(input.Filter, specification);
- var list = await _wmsmaterialRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+ var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
+ var count = await _wmsmaterialRepository.GetCountAsync(material,input.Filter, specification);
+
+ var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
}
@@ -52,18 +56,17 @@
{
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();
var sort = input.Sort ?? maxSort;
- var wmsmaterial = new WmsMaterial
- {
- };
+ var wmsmaterial = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
+ wmsmaterial.Sort = sort;
input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);
await _wmsmaterialRepository.InsertAsync(wmsmaterial);
@@ -82,16 +85,28 @@
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);
input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);
- wmsmaterial.MaterialCode = input.MaterialCode;
+ wmsmaterial.MaterialName = input.MaterialName;
+ wmsmaterial.PurchaseType = input.PurchaseType;
+ wmsmaterial.MaterialType = input.MaterialType;
+ wmsmaterial.PrimaryUnit = input.PrimaryUnit;
+ wmsmaterial.Standard = input.Standard;
+ wmsmaterial.OuterDiameter = input.OuterDiameter;
+ wmsmaterial.WallThickness = input.WallThickness;
+ wmsmaterial.MaterialQuality = input.MaterialQuality;
+ wmsmaterial.Length = input.Length;
+ wmsmaterial.IsMainBranch = input.IsMainBranch;
+ wmsmaterial.Factory = input.Factory;
+ wmsmaterial.MaterialModel = input.MaterialModel;
+ wmsmaterial.Certification = input.Certification;
await _wmsmaterialRepository.UpdateAsync(wmsmaterial);
@@ -152,7 +167,7 @@
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmsmaterialRepository.GetListAsync(nameof(WmsMaterial.Sort));
+ var list = await _wmsmaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -196,7 +211,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} 鍚嶇О閲嶅");
@@ -208,24 +223,35 @@
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,
+ 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,
};
@@ -235,8 +261,19 @@
{
var wmsmaterialCreateDto = new WmsMaterialCreateDto
{
- MaterialCode = wmsmaterial.MaterialCode,
+ MaterialNo = wmsmaterial.MaterialNo,
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,
};
@@ -285,15 +322,17 @@
}
var specification = new WmsMaterialSpecification(input.Name);
- var list = await _wmsmaterialRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+
+ 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 result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);
var sheets = new Dictionary<string, object>
{
- ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "WmsMaterial鍒楄〃" : result.Count == 1 ? result.First()?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = result.Count > 1 ? "WmsMaterial鍒楄〃" : result.Count == 1 ? result[0]?.MaterialNo : "WmsMaterial妯＄増";
return (sheets, fileName);
}
@@ -304,7 +343,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