From 358e8f30447f8ba05af42b66d45ddf1a93878b6d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 17:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Templete/AppService/AppService模板.txt | 51 ++++++++++++---------------------------------------
1 files changed, 12 insertions(+), 39 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/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 271647a..0d1d5bb 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"
@@ -1,8 +1,7 @@
using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$;
using CMS.Plugin.$NameSpacePath$.Application.Contracts.Services;
using CMS.Plugin.$NameSpacePath$.Domain.Shared;
-using CMS.Plugin.$NameSpacePath$.Domain.Shared.Util;
-using CMS.Plugin.$NameSpacePath$.Domain.Shared.$EntityName$;
+using CmsQueryExtensions;
using CMS.Plugin.$NameSpacePath$.Domain.$EntityName$;
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
@@ -100,10 +99,10 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var exist = await $EntityInstanceName$Repository.NameExistAsync(input.MaterialCode);
+ var exist = await $EntityInstanceName$Repository.NameExistAsync(input.$ValidateRepeatName$);
if (exist)
{
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.$ValidateRepeatName$]);
}
var maxSort = await $EntityInstanceName$Repository.GetMaxSortAsync();
@@ -135,10 +134,10 @@
await CheckCreateOrUpdateDtoAsync(input);
var updateObj = await $EntityInstanceName$Repository.GetAsync(id);
- var exist = await $EntityInstanceName$Repository.NameExistAsync(input.MaterialCode, updateObj.Id);
+ var exist = await $EntityInstanceName$Repository.NameExistAsync(input.$ValidateRepeatName$, updateObj.Id);
if (exist)
{
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.$ValidateRepeatName$]);
}
updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
@@ -271,7 +270,7 @@
#region 导入校验
// 判断名称是否重复，并输出第几行重复
- var duplicate$EntityName$s = importItems.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
+ var duplicate$EntityName$s = importItems.GroupBy(x => x.$ValidateRepeatName$).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} 名称重复");
@@ -283,36 +282,23 @@
foreach (var impItem in importItems)
{
- if (impItem.MaterialCode.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
+ if (impItem.$ValidateRepeatName$.IsNullOrWhiteSpace())
{
continue;
}
- if (impItem.MaterialCode.IsNullOrWhiteSpace())
+ if (impItem.$ValidateRepeatName$.IsNullOrWhiteSpace())
{
var errorMsg = $"导入失败！配置，第{impItem.RowIndex}行：$EntityName$名称不能为空";
throw new UserFriendlyException(errorMsg);
}
- var old$EntityName$ = await $EntityInstanceName$Repository.FindByNameAsync(impItem.MaterialCode);
+ var old$EntityName$ = await $EntityInstanceName$Repository.FindByNameAsync(impItem.$ValidateRepeatName$);
if (old$EntityName$ != null)
{
var $EntityInstanceName$UpdateDto = new $EntityName$UpdateDto
{
- 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,
+ $AppService_ImportAsync$
};
$EntityInstanceName$UpdateDtos.Add((impItem.RowIndex, old$EntityName$.Id, $EntityInstanceName$UpdateDto));
@@ -321,20 +307,7 @@
{
var $EntityInstanceName$CreateDto = new $EntityName$CreateDto
{
- 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,
+ $AppService_ImportAsync$
};
$EntityInstanceName$CreateDtos.Add((impItem.RowIndex, $EntityInstanceName$CreateDto));
@@ -401,7 +374,7 @@
["配置"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "$EntityName$列表" : result.Count == 1 ? result[0]?.MaterialCode : "$EntityName$模版";
+ var fileName = result.Count > 1 ? "$ChinaComment$列表" : result.Count == 1 ? result[0]?.$ValidateRepeatName$ : "$EntityName$模版";
return (sheets, fileName);
}
--
Gitblit v1.9.3