From 671b429b3c000eccf05910452505562f06defa73 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 07:54:56 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 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 6275ed5..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,9 @@
-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;
@@ -275,14 +275,14 @@
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} 鍚嶇О閲嶅");
@@ -292,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));
}
}
}
--
Gitblit v1.9.3