From afc28acd440fec723ceb22d55600bbd2754e8e23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 10:57:15 +0800
Subject: [PATCH] 22

---
 Weben_CMS专用代码生成器/Code/MainForm.cs |   75 +++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 29 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 b98d6f0..6f5f4e2 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"
@@ -6,6 +6,8 @@
 using Newtonsoft.Json;
 using System.Windows.Forms.VisualStyles;
 using GenerateCode_WeiBen_WMS.DataBaseFactory;
+using GenerateCode_WeiBen_WMS.Const;
+using GenerateCode_WeiBen_WMS.Model;
 
 namespace GenerateCode_GEBrilliantFactory
 {
@@ -25,13 +27,13 @@
             this.tb_OrderBy.Text = "ModifyTime";//鎺掑簭瀛楁
 
             this.tb_ProjectNamePrefix.Text = "Test";
-            this.tb_TableName.Text = "scms_auditlogs";//琛ㄥ悕
-            this.tb_WCF_NameSpacePath.Text = "WIP_";//WCF椤圭洰鍛藉悕绌洪棿 
+            this.tb_TableName.Text = "scms_wmsmaterials";//琛ㄥ悕
+            this.tb_WCF_NameSpacePath.Text = "HIAWms";//WCF椤圭洰鍛藉悕绌洪棿 
             this.tb_FileName.Text = "Xiangzi";//鏂囦欢鍓嶇紑鍚�
-            this.tb_ChinaComment.Text = "琛ㄧ殑涓枃娉ㄨВ";//涓枃娉ㄩ噴
+            this.tb_ChinaComment.Text = "鐗╂枡鍩虹淇℃伅琛�";//涓枃娉ㄩ噴
             this.tb_CreatePerson.Text = "shaocx";//鍒涘缓浜�
-            this.tb_EntityName.Text = "XiangziEntity";//瀹炰綋绫诲悕
-            this.tb_EntityProName.Text = "xiangzi";//瀹炰綋绫诲璞″悕
+            this.tb_EntityName.Text = "WmsMaterials";//瀹炰綋绫诲悕
+            this.tb_EntityProName.Text = "_wmsMaterials";//瀹炰綋绫诲璞″悕
 
             this.cmb_DataSource.DropDownStyle = ComboBoxStyle.DropDownList;
             List<ListItem> itemList = CommonHelper.GetDataSources();
@@ -125,6 +127,12 @@
                     this.tb_RoutePrefix.Focus();
                     return;
                 }
+                if (wcf_NameSpacePath == "")
+                {
+                    MessageBox.Show("璇疯緭鍏ュ懡鍚嶇┖闂达紒");
+                    this.tb_WCF_NameSpacePath.Focus();
+                    return;
+                }
 
                 //璇诲彇Mysql
                 var handler = DataBaseServiceFactory.GetHandle(dataBaseEnum);
@@ -136,42 +144,51 @@
                 }
 
                 string groupName = this.tb_GroupName.Text.Trim();
-                if (groupName == "")
-                {
-                    MessageBox.Show("璇疯緭鍏ュ垎缁勫悕锛�");
-                    this.tb_GroupName.Focus();
-                    return;
-                }
+                //if (groupName == "")
+                //{
+                //    MessageBox.Show("璇疯緭鍏ュ垎缁勫悕锛�");
+                //    this.tb_GroupName.Focus();
+                //    return;
+                //}
 
                 string addEntityParam = "Add" + modulelogo + "Param";//鏂板鍙傛暟绫诲悕
                 string str_generate = "";
                 bool tf;
 
+                GenerateCodeParam param = new GenerateCodeParam()
+                {
+                    Modulelogo = modulelogo,
+                    ChinaComment = chinaComment,
+                    NameSpacePath = wcf_NameSpacePath,
+                    ColumnNameList = columnList,
+                    EntityName = entityName
+                };
+
                 //鐢熸垚Model
                 //CreateModelFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
                 //CreateModelParamFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
 
-                //鐢熸垚 InputModel 鏂囦欢
-                str_generate = InputModel_Generate.CreateQueryModelLText(modulelogo, chinaComment, columnList, entityName);
-                tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+                //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);
 
-                //鐢熸垚 OutputModel 鏂囦欢
-                str_generate = OutputModel_Generate.CreateQueryModelLText(modulelogo, chinaComment, columnList, entityName);
-                tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.OutputModel, filePrefixName, entityName, modulelogo);
+                ////鐢熸垚 OutputModel 鏂囦欢
+                //str_generate = OutputModel_Generate.CreateQueryModelLText(modulelogo, chinaComment, columnList, entityName);
+                //tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.OutputModel, filePrefixName, entityName, modulelogo);
 
-                //鐢熸垚Controller鏂囦欢
-                //str_generate = Controller_Generate.CreateText(modulelogo, chinaComment, columnList, entityName, orderByName);
-                //tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.Controller, filePrefixName, entityName, modulelogo);
+                ////鐢熸垚Controller鏂囦欢
+                ////str_generate = Controller_Generate.CreateText(modulelogo, chinaComment, columnList, entityName, orderByName);
+                ////tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.Controller, filePrefixName, entityName, modulelogo);
 
-                //鐢熸垚Services鎺ュ彛鏂囦欢
-                str_generate = Services_Interface_Generate.CreateText(wcf_NameSpacePath, modulelogo, entityName, chinaComment, addEntityParam);
-                tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.WCF_InterFace, filePrefixName, entityName, modulelogo);
+                ////鐢熸垚Services鎺ュ彛鏂囦欢
+                //str_generate = Services_Interface_Generate.CreateText(wcf_NameSpacePath, modulelogo, entityName, chinaComment, addEntityParam);
+                //tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.WCF_InterFace, filePrefixName, entityName, modulelogo);
 
 
-                //鐢熸垚Services鎺ュ彛瀹炵幇鏂囦欢
-                str_generate = Services_InterfaceRealize_Generate.CreateText(wcf_NameSpacePath, modulelogo,
-                    entityName, chinaComment, filePrefixName, primaryKey, tableAlias, addEntityParam, columnList, groupName);
-                tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.WCF_InterFaceRealize, filePrefixName, entityName, modulelogo);
+                ////鐢熸垚Services鎺ュ彛瀹炵幇鏂囦欢
+                //str_generate = Services_InterfaceRealize_Generate.CreateText(wcf_NameSpacePath, modulelogo,
+                //    entityName, chinaComment, filePrefixName, primaryKey, tableAlias, addEntityParam, columnList, groupName);
+                //tf = TextHelper.Export2File(tbPath.Text, tableName, str_generate, FileType.WCF_InterFaceRealize, filePrefixName, entityName, modulelogo);
 
                 /*
                 //鐢熸垚瀛樺偍杩囩▼鏂囦欢
@@ -218,7 +235,7 @@
             }
             //MessageBox.Show("鐢熸垚鏂囦欢鎴愬姛锛�");
             //鎴愬姛涔嬪悗鎵撳紑鏂囦欢澶�
-            using (System.Diagnostics.Process.Start(this.tbPath.Text + "\\" + this.tb_TableName.Text))
+            using (System.Diagnostics.Process.Start(this.tbPath.Text))
             {
 
             }
@@ -322,7 +339,7 @@
             tb_EntityProName.Enabled = false;
             tb_FileName.Enabled = false;
             tb_Modulelogo.Enabled = false;
-            tb_WCF_NameSpacePath.Enabled = false;
+            tb_WCF_NameSpacePath.Enabled = true;
             tb_RoutePrefix.Enabled = false;
         }
 

--
Gitblit v1.9.3