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

schangxiang@126.com

2025-05-20 7e412efefa7ebb636cd591e5121ce4e9e54836c2

 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,25 +241,26 @@
                    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>();
                var str_enumList = this.tb_EnumList.Text.Trim();
                if (str_enumList.IndexOf(',') > -1)
                if (str_enumList.IndexOf('&') > -1)
                {
                    str_enumList = str_enumList.Replace("\n", "");
                    str_enumList = str_enumList.Replace("\t", "");
                    str_enumList = str_enumList.Replace("\r", "");
                    var arr_enumList = str_enumList.Split(',');
                    var arr_enumList = str_enumList.Split('&');
                    foreach (var item in arr_enumList)
                    {
                        var arr_single = item.Split('|');
                        var arr_single = item.Split(',');
                        enumList.Add(new EnumModel()
                        {
                            EnumAttrName = arr_single[0],
                            EnumType = arr_single[1],
                            EnumTypeDesc = arr_single[2]
                            EnumTypeDesc = arr_single[0] + SystemConst.enumDescName
                        });
                    }
                }
@@ -267,12 +268,12 @@
                {
                    if (!string.IsNullOrEmpty(str_enumList))
                    {
                        var arr_single = str_enumList.Split('|');
                        var arr_single = str_enumList.Split(',');
                        enumList.Add(new EnumModel()
                        {
                            EnumAttrName = arr_single[0],
                            EnumType = arr_single[1],
                            EnumTypeDesc = arr_single[2]
                            EnumTypeDesc = arr_single[0] + SystemConst.enumDescName
                        });
                    }
                }
@@ -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)
        {
           
        }
    }
}