From 90776aadd4531fa054c8679d240edfaba91e005f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 14:31:47 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs |    2 
 Weben_CMS专用代码生成器/Code/MainForm.cs                                                                                                                |    4 ++
 Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs                                                                                                      |    3 +
 Weben_CMS专用代码生成器/Code/Templete/Entity/CreateOrUpdateDtoBase模板.txt                                                                                |   19 +++++++++
 Weben_CMS专用代码生成器/Code/Generate/Entity/CreateOrUpdateDtoBase_Generate.cs                                                                          |   35 +++++++++++++++++
 Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj                                                                                             |    4 ++
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs                                                                                                 |    4 -
 Weben_CMS专用代码生成器/Code/Model/SystemCommonVar.cs                                                                                                   |   29 +++-----------
 8 files changed, 74 insertions(+), 26 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/Generate/Entity/CreateOrUpdateDtoBase_Generate.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/Generate/Entity/CreateOrUpdateDtoBase_Generate.cs"
new file mode 100644
index 0000000..1b1f12c
--- /dev/null
+++ "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/Generate/Entity/CreateOrUpdateDtoBase_Generate.cs"
@@ -0,0 +1,35 @@
+锘�
+
+using GenerateCode_WeiBen_WMS.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace GenerateCode_GEBrilliantFactory
+{
+    /// <summary>
+    /// 鐢熸垚鏌ヨ瀹炰綋绫�
+    /// </summary>
+    public class CreateOrUpdateDtoBase_Generate : BaseGenerate
+    {
+        public static string CreateText(GenerateCodeParam param)
+        {
+            var str = TextHelper.ReadText(@"Templete\Entity\CreateOrUpdateDtoBase妯℃澘.txt");
+            CommonReplace(ref str);
+
+            CommonHelper.CommonReplaceStr(param, ref str);
+
+            string attrString = "";
+
+            List<ColumnModel> newColumnNameList = ListHelper.RemoveIdCreatorModifier(param.ColumnNameList);
+            for (int i = 0; i < newColumnNameList.Count; ++i)
+            {
+                attrString += StructStrHelper.GenerateAttributeForAddModel(newColumnNameList[i]);
+            }
+            str = str.Replace("$AddAttributes$", attrString);
+
+            return str;
+        }
+    }
+}
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/GenerateCode_WeiBen_CMS.csproj" "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/GenerateCode_WeiBen_CMS.csproj"
index 65e2665..1a425f7 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/GenerateCode_WeiBen_CMS.csproj"
+++ "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/GenerateCode_WeiBen_CMS.csproj"
@@ -109,6 +109,7 @@
     <Compile Include="Generate\BaseGenerate.cs" />
     <Compile Include="Generate\Controller\Controller_Generate.cs" />
     <Compile Include="Generate\Entity\AddModel_Generate.cs" />
+    <Compile Include="Generate\Entity\CreateOrUpdateDtoBase_Generate.cs" />
     <Compile Include="Generate\Entity\CreateDto_Generate.cs" />
     <Compile Include="Generate\Entity\OutputModel_Generate.cs" />
     <Compile Include="Generate\InsertSQL_Generate.cs" />
@@ -195,6 +196,9 @@
     <Content Include="Templete\Entity\CreateDto妯℃澘.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Templete\Entity\CreateOrUpdateDtoBase妯℃澘.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Templete\Entity\InputQueryModel妯℃澘.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
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 cb2cf4e..d49a1f2 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"
@@ -178,6 +178,10 @@
                 str_generate = CreateDto_Generate.CreateText(param);
                 tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateDto.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
 
+                //3銆佺敓鎴� CreateOrUpdateDtoBase 鏂囦欢
+                str_generate = CreateOrUpdateDtoBase_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateOrUpdateDtoBase.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
                 #endregion
 
 
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/Model/SystemCommonVar.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/Model/SystemCommonVar.cs"
index df025e3..e0cea39 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/Model/SystemCommonVar.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/Model/SystemCommonVar.cs"
@@ -8,42 +8,27 @@
 {
     public static class SystemCommonVar
     {
-        //public const string c_Id = "Id";
-
-        //public const string c_creator = "creator";
-
-        //public const string c_createTime = "createTime";
-
-        //public const string c_lastModifier = "lastModifier";
-
-        //public const string c_ModifyTime = "ModifyTime";
-
-        //public const string c_lastModifyTime = "lastModifyTime";
-
-        //public const string c_delFlag = "delFlag";
-
-        //public const string c_CreateId = "CreateId";
-
-        //public const string c_ModifyId = "ModifyId";
 
 
         public const string c_Id = "Id";
 
         public const string c_creator = "CreatedUserName";
 
-        public const string c_createTime = "CreatedTime";
+        public const string c_createTime = "CreationTime";
 
         public const string c_lastModifier = "UpdatedUserName";
 
-        public const string c_ModifyTime = "UpdatedTime";
+        public const string c_ModifyTime = "LastModificationTime";
 
-        public const string c_lastModifyTime = "UpdatedTime";
+        public const string c_lastModifyTime = "DeletionTime";
 
         public const string c_delFlag = "IsDeleted";
 
-        public const string c_CreateId = "CreatedUserId";
+        public const string c_DeleterId = "DeleterId";
 
-        public const string c_ModifyId = "UpdatedUserId";
+        public const string c_CreateId = "CreatorId";
+
+        public const string c_ModifyId = "LastModifierId";
 
         public const string c_ExtraProperties = "ExtraProperties";
 
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/Entity/CreateOrUpdateDtoBase\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/Entity/CreateOrUpdateDtoBase\346\250\241\346\235\277.txt"
new file mode 100644
index 0000000..27e202b
--- /dev/null
+++ "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/Entity/CreateOrUpdateDtoBase\346\250\241\346\235\277.txt"
@@ -0,0 +1,19 @@
+using CMS.Plugin.$NameSpacePath$.Domain.Shared.Enums;
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$;
+
+/// <summary>
+/// $ChinaComment$创建或更新基类
+/// </summary>
+public abstract class $EntityName$CreateOrUpdateDtoBase : ExtensibleEntityDto
+{
+    $AddAttributes$
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="$EntityName$CreateOrUpdateDtoBase"/> class.
+    /// </summary>
+    public $EntityName$CreateOrUpdateDtoBase() : base(false)
+    {
+    }
+}
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/Utility/ListHelper.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/Utility/ListHelper.cs"
index bef35a7..27ccaf5 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/Utility/ListHelper.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/Utility/ListHelper.cs"
@@ -240,6 +240,9 @@
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
                     )
                 {
                     continue;
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/Utility/StructStrHelper.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/Utility/StructStrHelper.cs"
index dea907b..2fafbe8 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/Utility/StructStrHelper.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/Utility/StructStrHelper.cs"
@@ -238,9 +238,7 @@
                     case DataTypeEnum.dt_datetime:
                     case DataTypeEnum.dt_datetime2:
                     case DataTypeEnum.dt_datetimeoffset:
-                        attrStr += "        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�n";
-                        attrStr += "        [HighSearchRangeAttribute]\n";
-                        attrStr += "        public List<string>" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "        public datetime" + str_NullFlag + attr + " { get; set; }\n";
                         attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
                         break;
                     case DataTypeEnum.dt_bigint:
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.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.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.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs"
index 9d4e9c8..4adce78 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.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.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.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs"
@@ -4,7 +4,7 @@
 namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
 
 /// <summary>
-/// WmsMaterial鍒涘缓鎴栨洿鏂板熀绫�
+/// 鐗╂枡鍩虹淇℃伅鍒涘缓鎴栨洿鏂板熀绫�
 /// </summary>
 public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
 {

--
Gitblit v1.9.3