From 336b57f9ca1598a9e7f8d7af323bde280590c16b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 13:49:01 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Code/MainForm.cs                           |   13 +
 /dev/null                                                   |  100 ----------------
 Weben_CMS专用代码生成器/Code/Templete/Entity/CreateDto模板.txt       |   17 ++
 Weben_CMS专用代码生成器/Code/Utility/TextHelper.cs                 |  154 ++++++++++++------------
 Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj        |    4 
 Weben_CMS专用代码生成器/Code/Generate/Entity/CreateDto_Generate.cs |   27 ++++
 6 files changed, 136 insertions(+), 179 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/CreateDto_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/CreateDto_Generate.cs"
new file mode 100644
index 0000000..646370c
--- /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/CreateDto_Generate.cs"
@@ -0,0 +1,27 @@
+锘�
+
+using GenerateCode_WeiBen_WMS.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace GenerateCode_GEBrilliantFactory
+{
+    /// <summary>
+    /// 鐢熸垚鏌ヨ瀹炰綋绫�
+    /// </summary>
+    public class CreateDto_Generate : BaseGenerate
+    {
+        public static string CreateText(GenerateCodeParam param)
+        {
+            var str = TextHelper.ReadText(@"Templete\Entity\CreateDto妯℃澘.txt");
+            CommonReplace(ref str);
+
+            CommonHelper.CommonReplaceStr(param, ref str);
+
+
+            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 05b343c..65e2665 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\CreateDto_Generate.cs" />
     <Compile Include="Generate\Entity\OutputModel_Generate.cs" />
     <Compile Include="Generate\InsertSQL_Generate.cs" />
     <Compile Include="Generate\VUE\VUE_Generate.cs" />
@@ -191,6 +192,9 @@
     <Content Include="Templete\Entity\AddModel妯℃澘.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Templete\Entity\CreateDto妯℃澘.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 6f5f4e2..cb2cf4e 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"
@@ -168,9 +168,18 @@
                 //CreateModelFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
                 //CreateModelParamFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
 
-                //1銆佺敓鎴� 鍒嗛〉鏌ヨ 鏂囦欢
+                #region 瀹炰綋绫�
+                var entityFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
+                //1銆佺敓鎴� 鍒嗛〉鏌ヨ瀹炰綋 鏂囦欢
                 str_generate = InputModel_Generate.CreateQueryModelLText(param);
-                tf = TextHelper.Export2File_V2(tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim(), tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+                tf = TextHelper.Export2File_V2(entityFilePath, $"Get{param.EntityName}Input.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+                //2銆佺敓鎴� CreateDto 鏂囦欢
+                str_generate = CreateDto_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateDto.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+                #endregion
+
 
                 ////鐢熸垚 OutputModel 鏂囦欢
                 //str_generate = OutputModel_Generate.CreateQueryModelLText(modulelogo, chinaComment, columnList, entityName);
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/CreateDto\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/CreateDto\346\250\241\346\235\277.txt"
new file mode 100644
index 0000000..19d0319
--- /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/CreateDto\346\250\241\346\235\277.txt"
@@ -0,0 +1,17 @@
+namespace CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.WmsMaterials;
+
+/// <summary>
+/// $ChinaComment$创建参数对象
+/// </summary>
+public class $EntityName$CreateDto : $EntityName$CreateOrUpdateDtoBase
+{
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public virtual int? Sort { get; set; }
+
+    /// <summary>
+    /// 是否禁用
+    /// </summary>
+    public bool? IsDisabled { get; set; } = 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/TextHelper.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/TextHelper.cs"
index c976dd3..73b5056 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/TextHelper.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/TextHelper.cs"
@@ -180,91 +180,91 @@
         /// <param name="entityName">瀹炰綋绫诲悕</param>
         /// <param name="modulelogo">妯″潡鍚嶅瓧</param>
         /// <returns></returns>
-        public static bool Export2File_V2(string _strPath, string _tableName, string _code, FileType fileType,
+        public static bool Export2File_V2(string _strPath,string fileName, string _tableName, string _code, FileType fileType,
             string filePrefixName, string entityName, string modulelogo)
         {
             string fileFolderPath = _strPath + "\\";
 
-            string fileTypeName = "";
-            switch (fileType)
-            {
-                case FileType.Model:
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.AddModelParam:
-                    entityName = "Add" + modulelogo + "Param";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.IBLL:
-                    entityName = "I" + filePrefixName + "BLL";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.Controller:
-                    entityName = entityName + "Controller";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.JS:
-                    entityName = filePrefixName;
-                    fileTypeName = ".js";
-                    break;
-                case FileType.CSHTML_List:
-                    entityName = filePrefixName;
-                    fileTypeName = ".cshtml";
-                    break;
-                case FileType.CSHTML_Detail:
-                    entityName = filePrefixName;
-                    fileTypeName = "Detail.cshtml";
-                    break;
-                case FileType.XML:
-                    entityName = filePrefixName;
-                    fileTypeName = ".xml";
-                    break;
-                case FileType.Proc:
-                    entityName = filePrefixName;
-                    fileTypeName = "Proc.sql";
-                    break;
-                case FileType.DAL:
-                    entityName = filePrefixName;
-                    fileTypeName = "DAL.cs";
-                    break;
-                case FileType.BLL:
-                    entityName = filePrefixName;
-                    fileTypeName = "BLL.cs";
-                    break;
-                case FileType.InputModel:
-                    entityName = entityName + "Input";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.OutputModel:
-                    entityName = entityName + "Output";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.WCF_InterFace:
-                    entityName = "I" + entityName + "Service";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.WCF_InterFaceRealize:
-                    entityName = entityName + "Service";
-                    fileTypeName = ".cs";
-                    break;
-                case FileType.SQL_Insert:
-                    entityName = _tableName + "InsertSQL";
-                    fileTypeName = ".txt";
-                    break;
-                case FileType.VUE_FunConfig:
-                    entityName = _tableName + "VUE鏂规硶閰嶇疆";
-                    fileTypeName = ".txt";
-                    break;
-                case FileType.VUEFile:
-                    entityName = modulelogo;
-                    fileTypeName = ".vue";
-                    break;
-            }
+            //string fileTypeName = "";
+            //switch (fileType)
+            //{
+            //    case FileType.Model:
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.AddModelParam:
+            //        entityName = "Add" + modulelogo + "Param";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.IBLL:
+            //        entityName = "I" + filePrefixName + "BLL";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.Controller:
+            //        entityName = entityName + "Controller";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.JS:
+            //        entityName = filePrefixName;
+            //        fileTypeName = ".js";
+            //        break;
+            //    case FileType.CSHTML_List:
+            //        entityName = filePrefixName;
+            //        fileTypeName = ".cshtml";
+            //        break;
+            //    case FileType.CSHTML_Detail:
+            //        entityName = filePrefixName;
+            //        fileTypeName = "Detail.cshtml";
+            //        break;
+            //    case FileType.XML:
+            //        entityName = filePrefixName;
+            //        fileTypeName = ".xml";
+            //        break;
+            //    case FileType.Proc:
+            //        entityName = filePrefixName;
+            //        fileTypeName = "Proc.sql";
+            //        break;
+            //    case FileType.DAL:
+            //        entityName = filePrefixName;
+            //        fileTypeName = "DAL.cs";
+            //        break;
+            //    case FileType.BLL:
+            //        entityName = filePrefixName;
+            //        fileTypeName = "BLL.cs";
+            //        break;
+            //    case FileType.InputModel:
+            //        entityName = entityName + "Input";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.OutputModel:
+            //        entityName = entityName + "Output";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.WCF_InterFace:
+            //        entityName = "I" + entityName + "Service";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.WCF_InterFaceRealize:
+            //        entityName = entityName + "Service";
+            //        fileTypeName = ".cs";
+            //        break;
+            //    case FileType.SQL_Insert:
+            //        entityName = _tableName + "InsertSQL";
+            //        fileTypeName = ".txt";
+            //        break;
+            //    case FileType.VUE_FunConfig:
+            //        entityName = _tableName + "VUE鏂规硶閰嶇疆";
+            //        fileTypeName = ".txt";
+            //        break;
+            //    case FileType.VUEFile:
+            //        entityName = modulelogo;
+            //        fileTypeName = ".vue";
+            //        break;
+            //}
             if (!Directory.Exists(fileFolderPath))
             {
                 Directory.CreateDirectory(fileFolderPath);
             }
-            string filePath = fileFolderPath + "\\" + entityName + fileTypeName;
+            string filePath = fileFolderPath + "\\" + fileName;
             using (StreamWriter outfile = new StreamWriter(filePath, false, Encoding.GetEncoding("UTF-8")))
             {
                 outfile.Write(_code);
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/ExportWmsMaterialModel.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/ExportWmsMaterialModel.cs"
deleted file mode 100644
index 5c5e666..0000000
--- "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/ExportWmsMaterialModel.cs"
+++ /dev/null
@@ -1,100 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials
-{
-    /// <summary>
-    /// 瀵煎嚭瀹炰綋绫�
-    /// </summary>
-    public class ExportWmsMaterialModel
-    {
-        /// <summary>
-        /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
-        /// </summary>
-        [Description("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�")]
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡鍚嶇О
-        /// </summary>
-        [Description("鐗╂枡鍚嶇О")]
-        public string MaterialName { get; set; }
-
-        /// <summary>
-        /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
-        /// </summary>
-        [Description("閲囪喘绫诲瀷锛堟灇涓惧�硷級")]
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
-        /// </summary>
-        [Description("鐗╂枡绫诲瀷锛堟灇涓惧�硷級")]
-        public string MaterialType { get; set; }
-
-        /// <summary>
-        /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
-        /// </summary>
-        [Description("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�")]
-        public string PrimaryUnit { get; set; }
-
-        /// <summary>
-        /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
-        /// </summary>
-        [Description("瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�")]
-        public string Standard { get; set; }
-
-        /// <summary>
-        /// 澶栧緞锛堝崟浣嶏細mm锛�
-        /// </summary>
-        [Description("澶栧緞锛堝崟浣嶏細mm锛�")]
-        public decimal OuterDiameter { get; set; }
-
-        /// <summary>
-        /// 澹佸帤锛堝崟浣嶏細mm锛�
-        /// </summary>
-        [Description("澹佸帤锛堝崟浣嶏細mm锛�")]
-        public decimal WallThickness { get; set; }
-
-        /// <summary>
-        /// 鏉愯川锛堝锛�304涓嶉攬閽級
-        /// </summary>
-        [Description("鏉愯川锛堝锛�304涓嶉攬閽級")]
-        public string MaterialQuality { get; set; }
-
-        /// <summary>
-        /// 闀垮害锛堝崟浣嶏細m锛�
-        /// </summary>
-        [Description("闀垮害锛堝崟浣嶏細m锛�")]
-        public decimal Length { get; set; }
-
-        /// <summary>
-        /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
-        /// </summary>
-        [Description("鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�")]
-        public string IsMainBranch { get; set; }
-
-        /// <summary>
-        /// 鐢熶骇宸ュ巶
-        /// </summary>
-        [Description("鐢熶骇宸ュ巶")]
-        public string Factory { get; set; }
-
-        /// <summary>
-        /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
-        /// </summary>
-        [Description("璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級")]
-        public string Certification { get; set; }
-
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        [Description("澶囨敞")]
-        public virtual string Remark { get; set; }
-    }
-}

--
Gitblit v1.9.3