From 928c61ccddebc8d2c697b86ee9bee0c207330a8c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 07:18:22 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 2
Weben_CMS专用代码生成器/Code/常用.txt | 4 +
Weben_CMS专用代码生成器/Code/Templete/AppService/AppService模板.txt | 64 ++++++++++++++++++++++---------
3 files changed, 49 insertions(+), 21 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/Code/MainForm.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/Code/MainForm.cs"
index 22b30fa..6ba8aff 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/Code/MainForm.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/Code/MainForm.cs"
@@ -431,7 +431,7 @@
private void MainForm_Load(object sender, EventArgs e)
{
- tb_EntityProName.Enabled = false;
+ //tb_EntityProName.Enabled = false;
tb_FileName.Enabled = false;
tb_Modulelogo.Enabled = false;
tb_WCF_NameSpacePath.Enabled = true;
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/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
index 35d7019..ac2ff37 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/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
@@ -264,14 +264,14 @@
var $EntityInstanceName$CreateDtos = new List<(int RowIndex, $EntityName$CreateDto Item)>();
var $EntityInstanceName$UpdateDtos = new List<(int RowIndex, Guid Id, $EntityName$UpdateDto Item)>();
- var $EntityInstanceName$s = input.$EntityInstanceName$s;
+ var importItems = input.$EntityName$s;
- if ($EntityInstanceName$s != null && $EntityInstanceName$s.Any())
+ if (importItems != null && importItems.Any())
{
#region 导入校验
// 判断名称是否重复，并输出第几行重复
- var duplicate$EntityName$s = $EntityInstanceName$s.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
+ var duplicate$EntityName$s = importItems.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
if (duplicate$EntityName$s?.Any() == true)
{
var duplicate$EntityName$Msgs = duplicate$EntityName$s.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} 行：{x.Key} 名称重复");
@@ -281,65 +281,91 @@
#endregion
- foreach (var $EntityInstanceName$ in $EntityInstanceName$s)
+ foreach (var impItem in importItems)
{
- if ($EntityInstanceName$.MaterialCode.IsNullOrWhiteSpace() && $EntityInstanceName$.MaterialName.IsNullOrWhiteSpace())
+ if (impItem.MaterialCode.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
{
continue;
}
- if ($EntityInstanceName$.MaterialCode.IsNullOrWhiteSpace())
+ if (impItem.MaterialCode.IsNullOrWhiteSpace())
{
- var errorMsg = $"导入失败！配置，第{$EntityInstanceName$.RowIndex}行：$EntityInstanceName$名称不能为空";
+ var errorMsg = $"导入失败！配置，第{impItem.RowIndex}行：$EntityName$名称不能为空";
throw new UserFriendlyException(errorMsg);
}
- var old$EntityName$ = await $EntityInstanceName$Repository.FindByNameAsync($EntityName$.MaterialCode);
+ var old$EntityName$ = await $EntityInstanceName$Repository.FindByNameAsync(impItem.MaterialCode);
if (old$EntityName$ != null)
{
var $EntityInstanceName$UpdateDto = new $EntityName$UpdateDto
{
- $UpdateAttributesForImport$
+ 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,
};
- $EntityInstanceName$UpdateDtos.Add(($EntityName$.RowIndex, old$EntityName$.Id, $EntityInstanceName$UpdateDto));
+ $EntityInstanceName$UpdateDtos.Add((impItem.RowIndex, old$EntityName$.Id, $EntityInstanceName$UpdateDto));
}
else
{
- var $EntityName$CreateDto = new $EntityName$CreateDto
+ var $EntityInstanceName$CreateDto = new $EntityName$CreateDto
{
- $UpdateAttributesForImport$
+ 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,
};
- $EntityInstanceName$CreateDtos.Add(($EntityName$.RowIndex, $EntityName$CreateDto));
+ $EntityInstanceName$CreateDtos.Add((impItem.RowIndex, $EntityInstanceName$CreateDto));
}
}
}
// 新增
- foreach (var $EntityName$Dto in $EntityInstanceName$CreateDtos)
+ foreach (var $EntityInstanceName$Dto in $EntityInstanceName$CreateDtos)
{
try
{
- await CreateAsync($EntityName$Dto.Item);
+ await CreateAsync($EntityInstanceName$Dto.Item);
}
catch (Exception e)
{
- var errorMsg = $"导入失败！配置，第{$EntityName$Dto.RowIndex}行：{e.Message}，终止导入";
+ var errorMsg = $"导入失败！配置，第{$EntityInstanceName$Dto.RowIndex}行：{e.Message}，终止导入";
throw new UserFriendlyException(errorMsg);
}
}
// 更新
- foreach (var $EntityName$Dto in $EntityInstanceName$UpdateDtos)
+ foreach (var $EntityInstanceName$Dto in $EntityInstanceName$UpdateDtos)
{
try
{
- await UpdateAsync($EntityName$Dto.Id, $EntityName$Dto.Item);
+ await UpdateAsync($EntityInstanceName$Dto.Id, $EntityInstanceName$Dto.Item);
}
catch (Exception e)
{
- var errorMsg = $"导入失败！配置，第{$EntityName$Dto.RowIndex}行：{e.Message}，终止导入";
+ var errorMsg = $"导入失败！配置，第{$EntityInstanceName$Dto.RowIndex}行：{e.Message}，终止导入";
throw new UserFriendlyException(errorMsg);
}
}
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/Code/\345\270\270\347\224\250.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/\345\270\270\347\224\250.txt"
index 1092e3c..dd41129 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/Code/\345\270\270\347\224\250.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/\345\270\270\347\224\250.txt"
@@ -3,4 +3,6 @@
$EntityName$
-$NameSpacePath$
\ No newline at end of file
+$NameSpacePath$
+
+$EntityInstanceName$
\ No newline at end of file
--
Gitblit v1.9.3