Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-16 5703aa1072175f4390006f73e43a4236e81ad678

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/MainForm.cs

@@ -43,7 +43,7 @@
            this.tb_LikeQueryAttrsName.Text = "请输入物料编码/物料名称/备注";

            //this.tb_EntityProName.Text = "wmsMaterial";//实体类对象名
            this.tb_EnumList.Text = "PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc";
            this.tb_EnumList.Text = "PurchaseType,PurchaseTypeEnum&MaterialType,MaterialTypeEnum&IsMainBranch,YesNoEnum";

            this.cmb_DataSource.DropDownStyle = ComboBoxStyle.DropDownList;
            List<ListItem> itemList = CommonHelper.GetDataSources();
@@ -215,11 +215,11 @@
                    return;
                }
                //增加校验
                if (columnList.Where(x => x.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()).Count() == 0)
                {
                    MessageBox.Show($"表中没有字段{SystemCommonVar.c_creator}！");
                    return;
                }
                //if (columnList.Where(x => x.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()).Count() == 0)
                //{
                //    MessageBox.Show($"表中没有字段{SystemCommonVar.c_creator}！");
                //    return;
                //}



@@ -241,7 +241,8 @@
                    EntityInstanceName = tableAlias,
                    LikeQueryAttrs = _tb_LikeQueryAttrs,
                    LikeQueryAttrsName = _tb_LikeQueryAttrsName,
                    ValidateRepeatName = this.tb_ValidateRepeatName.Text
                    ValidateRepeatName = this.tb_ValidateRepeatName.Text,
                    TableName = tableName
                };
                //处理枚举类型
                List<EnumModel> enumList = new List<EnumModel>();
@@ -282,6 +283,13 @@
                //CreateModelFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
                //CreateModelParamFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
                genCodeRootPath = tbPath.Text + @"\" + tb_WCF_NameSpacePath.Text.Trim();

                //是否要事先清理文件夹
                if (this.ck_IsDeletefile.Checked)
                {
                    FileHelper.ClearFolder(genCodeRootPath); // é€’归删除
                }

                //var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
                var webFolerPath = _tb_VueRootFolerName;
                #region å®žä½“ç±»
@@ -824,5 +832,10 @@
        {
            this.tb_FilePath.Text = "";
        }

        private void ck_IsDeletefile_CheckedChanged(object sender, EventArgs e)
        {
           
        }
    }
}