前端文件夹名称可配置

schangxiang@126.com

2025-05-09 01b99769af32e7de2d5f3ded5ce2f2bd3df526a5

前端文件夹名称可配置

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/³öÈë¿âµ¥¾Ý.txt

@@ -9,4 +9,5 @@
[模糊查询字段]:'OrderNo', 'MaterialNo', 'MaterialBatch'
[模糊查询字段名]:请输入单据号/物料编号/批次
[项目命名空间]:HIAWms
[枚举类型字段集合]:OrderStatus|OrderStatusEnum|OrderStatusDesc,OrderType|OrderTypeEnum|OrderTypeDesc,StockType|StockTypeEnum|StockTypeDesc
[枚举类型字段集合]:OrderStatus|OrderStatusEnum|OrderStatusDesc,OrderType|OrderTypeEnum|OrderTypeDesc,StockType|StockTypeEnum|StockTypeDesc
[前端根文件夹名称]:web

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/³öÈë¿âµ¥¾ÝÏêÇé.txt

@@ -9,4 +9,5 @@
[模糊查询字段]:'OrderNo', 'MaterialNo', 'MaterialId'
[模糊查询字段名]:请输入单据号/物料编号/物料ID
[项目命名空间]:HIAWms
[枚举类型字段集合]:OrderType|OrderTypeEnum|OrderTypeDesc
[枚举类型字段集合]:OrderType|OrderTypeEnum|OrderTypeDesc
[前端根文件夹名称]:web

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/ÎïÁÏÈÝÆ÷¹Øϵ.txt

@@ -9,4 +9,5 @@
[模糊查询字段]:'MaterialId'
[模糊查询字段名]:请输入物料Id
[项目命名空间]:HIAWms
[枚举类型字段集合]:
[枚举类型字段集合]:
[前端根文件夹名称]:web

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/Ïé×ÓµÄÎïÁÏÐÅÏ¢±íÅäÖÃÎı¾.txt

ÎļþÃû´Ó Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/ÎïÁÏÐÅÏ¢±íÅäÖÃÎı¾.txt ÐÞ¸Ä
@@ -9,4 +9,5 @@
[模糊查询字段]:'MaterialCode', 'MaterialName', 'Remark'
[模糊查询字段名]:请输入物料编码/物料名称/备注
[项目命名空间]:HIAWms
[枚举类型字段集合]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
[枚举类型字段集合]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
[前端根文件夹名称]:templatedemo_web

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/GenerateCode_WeiBen_CMS.csproj

@@ -476,7 +476,7 @@
    <Content Include="Templete\Web\Views\Pages\EntityNameClass\EntityNameClass模板.txt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="File\GenerateCodeConfigParamFiles\物料信息表配置文本.txt">
    <Content Include="File\GenerateCodeConfigParamFiles\祥子的物料信息表配置文本.txt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="常用.txt" />

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

@@ -56,7 +56,7 @@
            this.tb_Modulelogo = new System.Windows.Forms.TextBox();
            this.label3 = new System.Windows.Forms.Label();
            this.btn_InsertSql = new System.Windows.Forms.Button();
            this.tb_RoutePrefix = new System.Windows.Forms.TextBox();
            this.tb_VueRootFolerName = new System.Windows.Forms.TextBox();
            this.label13 = new System.Windows.Forms.Label();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.label17 = new System.Windows.Forms.Label();
@@ -336,22 +336,22 @@
            this.btn_InsertSql.Visible = false;
            this.btn_InsertSql.Click += new System.EventHandler(this.btn_InsertSql_Click);
            // 
            // tb_RoutePrefix
            // tb_VueRootFolerName
            // 
            this.tb_RoutePrefix.Location = new System.Drawing.Point(737, 316);
            this.tb_RoutePrefix.Name = "tb_RoutePrefix";
            this.tb_RoutePrefix.Size = new System.Drawing.Size(145, 21);
            this.tb_RoutePrefix.TabIndex = 44;
            this.tb_RoutePrefix.Text = "1111";
            this.tb_VueRootFolerName.Location = new System.Drawing.Point(737, 316);
            this.tb_VueRootFolerName.Name = "tb_VueRootFolerName";
            this.tb_VueRootFolerName.Size = new System.Drawing.Size(145, 21);
            this.tb_VueRootFolerName.TabIndex = 44;
            this.tb_VueRootFolerName.Text = "1111";
            // 
            // label13
            // 
            this.label13.AutoSize = true;
            this.label13.Location = new System.Drawing.Point(646, 318);
            this.label13.Location = new System.Drawing.Point(622, 319);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(77, 12);
            this.label13.Size = new System.Drawing.Size(107, 12);
            this.label13.TabIndex = 43;
            this.label13.Text = "WCF路由前缀:";
            this.label13.Text = "前端根文件夹名称:";
            this.label13.Click += new System.EventHandler(this.label13_Click);
            // 
            // groupBox1
@@ -427,7 +427,7 @@
            this.groupBox2.Controls.Add(this.groupBox3);
            this.groupBox2.Controls.Add(this.tb_FileName);
            this.groupBox2.Controls.Add(this.lblds);
            this.groupBox2.Controls.Add(this.tb_RoutePrefix);
            this.groupBox2.Controls.Add(this.tb_VueRootFolerName);
            this.groupBox2.Controls.Add(this.tb_TableName);
            this.groupBox2.Controls.Add(this.label13);
            this.groupBox2.Controls.Add(this.label1);
@@ -762,7 +762,7 @@
        private System.Windows.Forms.TextBox tb_Modulelogo;
        private System.Windows.Forms.Label label3;
        private System.Windows.Forms.Button btn_InsertSql;
        private System.Windows.Forms.TextBox tb_RoutePrefix;
        private System.Windows.Forms.TextBox tb_VueRootFolerName;
        private System.Windows.Forms.Label label13;
        private System.Windows.Forms.GroupBox groupBox1;
        private System.Windows.Forms.Label lbl_DataSource;

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

@@ -165,7 +165,7 @@
                string entityName = this.tb_EntityName.Text.Trim();//实体类名
                string tableAlias = this.tb_EntityProName.Text.Trim();//实体类对象名/表别名
                string orderByName = this.tb_OrderBy.Text.Trim();//排序字段名称
                string routePrefix = this.tb_RoutePrefix.Text.Trim();//WCF路由前缀
                string _tb_VueRootFolerName = this.tb_VueRootFolerName.Text.Trim();//WCF路由前缀
                string connStr = this.lbl_DataSource.Text.Trim();//数据库连接字符串
                if (connStr == "")
                {
@@ -185,10 +185,10 @@
                    this.tb_Primary.Focus();
                    return;
                }
                if (routePrefix == "")
                if (_tb_VueRootFolerName == "")
                {
                    MessageBox.Show("请输入WCF路由前缀！");
                    this.tb_RoutePrefix.Focus();
                    MessageBox.Show("请输入 å‰ç«¯æ ¹æ–‡ä»¶å¤¹åç§°ï¼");
                    this.tb_VueRootFolerName.Focus();
                    return;
                }
                if (wcf_NameSpacePath == "")
@@ -273,7 +273,8 @@
                //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();
                var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
                //var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
                var webFolerPath = _tb_VueRootFolerName;
                #region å®žä½“ç±»
                var entityFilePath = genCodeRootPath + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
                //1、生成 åˆ†é¡µæŸ¥è¯¢å®žä½“ æ–‡ä»¶
@@ -636,7 +637,7 @@
            tb_FileName.Enabled = false;
            tb_Modulelogo.Enabled = false;
            tb_WCF_NameSpacePath.Enabled = true;
            tb_RoutePrefix.Enabled = false;
            tb_VueRootFolerName.Enabled = false;
        }

        private void cmb_DataSource_SelectedIndexChanged(object sender, EventArgs e)
@@ -759,6 +760,9 @@
                            case "枚举类型字段集合":
                                entity.枚举类型字段集合 = propertyValue;
                                break;
                            case "前端根文件夹名称":
                                entity.前端根文件夹名称 = propertyValue;
                                break;
                        }
                    }
                }
@@ -793,6 +797,7 @@
                this.tb_EnumList.Text = entity.枚举类型字段集合;
                this.tb_ValidateRepeatName.Text = entity.重复性校验字段;
                this.tb_DeleteAlertAttr.Text = entity.删除提示字段;
                this.tb_VueRootFolerName.Text = entity.前端根文件夹名称;

            }
            catch (FileNotFoundException)

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

@@ -21,5 +21,7 @@
        public string é¡¹ç›®å‘½åç©ºé—´ { get; set; }

        public string æžšä¸¾ç±»åž‹å­—段集合 { get; set; }

        public string å‰ç«¯æ ¹æ–‡ä»¶å¤¹åç§° { get; set; }
    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs

@@ -54,6 +54,16 @@
        public SearchFilterModeEnum MaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public bool?  IsValid { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }
@@ -62,6 +72,16 @@
        /// ç‰©æ–™åç§°-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public bool?  IsSelfMade { get; set; }

        /// <summary>
        /// æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -74,6 +94,16 @@
        public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int?  Num { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  MaterialType { get; set; }
@@ -82,6 +112,16 @@
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int?  SelfNum { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -102,6 +142,16 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Standard_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        public decimal?  NullLength { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤–径（单位：mm）
@@ -240,6 +290,16 @@
        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int?  Sort { get; set; }

        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦åˆ é™¤
        /// </summary>
        public bool?  IsDeleted { get; set; }
@@ -250,6 +310,16 @@
        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤äººID
        /// </summary>
        public string DeleterId { get; set; }
@@ -258,6 +328,16 @@
        /// åˆ é™¤äººID-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool?  IsDisabled { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// åˆ é™¤æ—¶é—´
@@ -286,36 +366,6 @@
        /// ä¿®æ”¹äºº-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum LastModifierName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int?  Sort { get; set; }

        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool?  IsDisabled { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ‰©å±•å­—段1
@@ -348,54 +398,24 @@
        public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ•°é‡
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public bool?  IsSelfMade { get; set; }
        public string OperationRemark { get; set; }

        /// <summary>
        /// æ•°é‡-查询关系运算符 
        /// æ“ä½œå¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public bool?  IsValid { get; set; }
        public string DeleteRemark { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™-查询关系运算符 
        /// åˆ é™¤å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// 
        /// </summary>
        public decimal?  NullLength { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int?  Num { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int?  SelfNum { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
        public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

 
} 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs

@@ -15,9 +15,19 @@
        public string MaterialCode { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public bool IsValid { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public bool? IsSelfMade { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -25,9 +35,19 @@
        public PurchaseTypeEnum PurchaseType { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int Num { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public MaterialTypeEnum MaterialType { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int? SelfNum { get; set; }

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -38,6 +58,11 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string? Standard { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public decimal? NullLength { get; set; }

        /// <summary>
        /// å¤–径（单位：mm）
@@ -100,16 +125,6 @@
        public string? LastModifierId { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public string? CreatorName { get; set; }

        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public string? LastModifierName { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }
@@ -123,6 +138,16 @@
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        public string? CreatorName { get; set; }

        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        public string? LastModifierName { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
@@ -140,29 +165,14 @@
        public string? ExtraField3 { get; set; }

        /// <summary>
        /// æ•°é‡
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public bool? IsSelfMade { get; set; }
        public string? OperationRemark { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public bool IsValid { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public decimal? NullLength { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int Num { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int? SelfNum { get; set; }
        public string? DeleteRemark { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs

@@ -18,9 +18,19 @@
        public string MaterialCode { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public bool IsValid { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public bool? IsSelfMade { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -38,6 +48,11 @@
            } 
        } 
        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int Num { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public MaterialTypeEnum MaterialType { get; set; }
@@ -53,6 +68,11 @@
            } 
        } 
        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int? SelfNum { get; set; }

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
        /// </summary>
        public string? PrimaryUnit { get; set; }
@@ -61,6 +81,11 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string? Standard { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public decimal? NullLength { get; set; }

        /// <summary>
        /// å¤–径（单位：mm）
@@ -153,14 +178,29 @@
        public string? LastModifierId { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }

        /// <summary>
        /// æ˜¯å¦åˆ é™¤
        /// </summary>
        public bool IsDeleted { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

        /// <summary>
        /// åˆ é™¤äººID
        /// </summary>
        public string? DeleterId { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// åˆ é™¤æ—¶é—´
@@ -178,21 +218,6 @@
        public string? LastModifierName { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
        /// </summary>
        public string? ExtraField1 { get; set; }
@@ -208,29 +233,14 @@
        public string? ExtraField3 { get; set; }

        /// <summary>
        /// æ•°é‡
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public bool? IsSelfMade { get; set; }
        public string? OperationRemark { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public bool IsValid { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public decimal? NullLength { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public int Num { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int? SelfNum { get; set; }
        public string? DeleteRemark { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs

@@ -17,10 +17,22 @@
        public string MaterialCode { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        [ExcelColumn(Name = "是否有效物料", Width = 25)]
        public bool IsValid { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [ExcelColumn(Name = "物料名称", Width = 25)]
        public string MaterialName { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        [ExcelColumn(Name = "数量", Width = 25)]
        public bool? IsSelfMade { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -29,10 +41,22 @@
        public PurchaseTypeEnum PurchaseType { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        [ExcelColumn(Name = "是否有效物料", Width = 25)]
        public int Num { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        [ExcelColumn(Name = "物料类型（枚举值）", Width = 25)]
        public MaterialTypeEnum MaterialType { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        [ExcelColumn(Name = "自有数量", Width = 25)]
        public int? SelfNum { get; set; }

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -45,6 +69,12 @@
        /// </summary>
        [ExcelColumn(Name = "规格/标准（如：GB/T 8163-2018）", Width = 25)]
        public string Standard { get; set; }

        /// <summary>
        /// 
        /// </summary>
        [ExcelColumn(Name = "", Width = 25)]
        public decimal? NullLength { get; set; }

        /// <summary>
        /// å¤–径（单位：mm）
@@ -107,18 +137,6 @@
        public string RedundantField3 { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        [ExcelColumn(Name = "创建人", Width = 25)]
        public string CreatorName { get; set; }

        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        [ExcelColumn(Name = "修改人", Width = 25)]
        public string LastModifierName { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        [ExcelColumn(Name = "排序", Width = 25)]
@@ -135,6 +153,18 @@
        /// </summary>
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        [ExcelColumn(Name = "创建人", Width = 25)]
        public string CreatorName { get; set; }

        /// <summary>
        /// ä¿®æ”¹äºº
        /// </summary>
        [ExcelColumn(Name = "修改人", Width = 25)]
        public string LastModifierName { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
@@ -155,34 +185,16 @@
        public string ExtraField3 { get; set; }

        /// <summary>
        /// æ•°é‡
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "数量", Width = 25)]
        public bool? IsSelfMade { get; set; }
        [ExcelColumn(Name = "操作备注", Width = 25)]
        public string OperationRemark { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "是否有效物料", Width = 25)]
        public bool IsValid { get; set; }

        /// <summary>
        /// 
        /// </summary>
        [ExcelColumn(Name = "", Width = 25)]
        public decimal? NullLength { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        [ExcelColumn(Name = "是否有效物料", Width = 25)]
        public int Num { get; set; }

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        [ExcelColumn(Name = "自有数量", Width = 25)]
        public int? SelfNum { get; set; }
        [ExcelColumn(Name = "删除备注", Width = 25)]
        public string DeleteRemark { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -144,11 +144,16 @@
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None); 
 
                updateObj.MaterialCode = input.MaterialCode;
        updateObj.IsValid = input.IsValid;
        updateObj.MaterialName = input.MaterialName;
        updateObj.IsSelfMade = input.IsSelfMade;
        updateObj.PurchaseType = input.PurchaseType;
        updateObj.Num = input.Num;
        updateObj.MaterialType = input.MaterialType;
        updateObj.SelfNum = input.SelfNum;
        updateObj.PrimaryUnit = input.PrimaryUnit;
        updateObj.Standard = input.Standard;
        updateObj.NullLength = input.NullLength;
        updateObj.OuterDiameter = input.OuterDiameter;
        updateObj.WallThickness = input.WallThickness;
        updateObj.MaterialQuality = input.MaterialQuality;
@@ -159,18 +164,15 @@
        updateObj.RedundantField1 = input.RedundantField1;
        updateObj.RedundantField2 = input.RedundantField2;
        updateObj.RedundantField3 = input.RedundantField3;
        updateObj.CreatorName = input.CreatorName;
        updateObj.LastModifierName = input.LastModifierName;
        updateObj.Remark = input.Remark;
        updateObj.IsDisabled = input.IsDisabled;
        updateObj.CreatorName = input.CreatorName;
        updateObj.LastModifierName = input.LastModifierName;
        updateObj.ExtraField1 = input.ExtraField1;
        updateObj.ExtraField2 = input.ExtraField2;
        updateObj.ExtraField3 = input.ExtraField3;
        updateObj.IsSelfMade = input.IsSelfMade;
        updateObj.IsValid = input.IsValid;
        updateObj.NullLength = input.NullLength;
        updateObj.Num = input.Num;
        updateObj.SelfNum = input.SelfNum;
        updateObj.OperationRemark = input.OperationRemark;
        updateObj.DeleteRemark = input.DeleteRemark;
 
 
        await wmsMaterialRepository.UpdateAsync(updateObj); 
@@ -327,11 +329,16 @@
                    var wmsMaterialUpdateDto = new WmsMaterialUpdateDto 
                    { 
                        MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -342,18 +349,15 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
IsSelfMade = impItem.IsSelfMade,
IsValid = impItem.IsValid,
NullLength = impItem.NullLength,
Num = impItem.Num,
SelfNum = impItem.SelfNum,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
 
                    }; 
 
@@ -364,11 +368,16 @@
                    var wmsMaterialCreateDto = new WmsMaterialCreateDto 
                    { 
                        MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -379,18 +388,15 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
IsSelfMade = impItem.IsSelfMade,
IsValid = impItem.IsValid,
NullLength = impItem.NullLength,
Num = impItem.Num,
SelfNum = impItem.SelfNum,
OperationRemark = impItem.OperationRemark,
DeleteRemark = impItem.DeleteRemark,
 
                    }; 
 
@@ -471,15 +477,15 @@
    { 
        Check.NotNull(input, nameof(input)); 
                Check.NotNullOrWhiteSpace(input.MaterialCode, "物料编码（唯一标识）", 64);
        Check.NotNull(input.IsValid, "是否有效物料");
        Check.NotNullOrWhiteSpace(input.MaterialName, "物料名称", 128);
        Check.NotNull(input.PurchaseType, "采购类型（枚举值）");
        Check.NotNull(input.Num, "是否有效物料");
        Check.NotNull(input.MaterialType, "物料类型（枚举值）");
        Check.NotNull(input.OuterDiameter, "外径（单位：mm）");
        Check.NotNull(input.WallThickness, "壁厚（单位：mm）");
        Check.NotNull(input.Length, "长度（单位：m）");
        Check.NotNull(input.IsMainBranch, "是否为主支管");
        Check.NotNull(input.IsValid, "是否有效物料");
        Check.NotNull(input.Num, "是否有效物料");
 
        return Task.CompletedTask; 
    } 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx

Binary files differ

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx

@@ -85,12 +85,29 @@
              rules: [{required: true, message: '物料编码（唯一标识）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'isValid', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
              rules: [{required: true, message: '物料名称不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '数量', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '采购类型（枚举值）', 
@@ -102,6 +119,23 @@
              rules: [{required: true, message: '采购类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
@@ -109,6 +143,22 @@
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
              rules: [{required: true, message: '物料类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '自有数量', 
                   prop: 'selfNum', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入自有数量', 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
@@ -123,6 +173,22 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                }, 
                { 
                   label: '', 
                   prop: 'nullLength', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 0.01,
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                }, 
                { 
                   label: '外径（单位：mm）', 
@@ -227,6 +293,13 @@
                   placeholder: '请输入冗余字段3 - é¢„留扩展用途', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '创建人', 
                   prop: 'creatorName', 
                   el: 'input', 
@@ -239,13 +312,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '扩展字段1', 
@@ -269,70 +335,18 @@
                   placeholder: '请输入扩展字段3', 
                }, 
                { 
                   label: '数量', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'isValid', 
                   el: 'select', 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '', 
                   prop: 'nullLength', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 0.01,
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '自有数量', 
                   prop: 'selfNum', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入自有数量', 
                   placeholder: '请输入删除备注', 
                },  
  ]) 
  /** 
@@ -370,11 +384,16 @@
    await formRef.value?.validate() 
    const data = { 
      materialCode: formData.value.materialCode, 
isValid: formData.value.isValid, 
materialName: formData.value.materialName, 
isSelfMade: formData.value.isSelfMade, 
purchaseType: formData.value.purchaseType, 
num: formData.value.num, 
materialType: formData.value.materialType, 
selfNum: formData.value.selfNum, 
primaryUnit: formData.value.primaryUnit, 
standard: formData.value.standard, 
nullLength: formData.value.nullLength, 
outerDiameter: formData.value.outerDiameter, 
wallThickness: formData.value.wallThickness, 
materialQuality: formData.value.materialQuality, 
@@ -385,17 +404,14 @@
redundantField1: formData.value.redundantField1, 
redundantField2: formData.value.redundantField2, 
redundantField3: formData.value.redundantField3, 
remark: formData.value.remark, 
creatorName: formData.value.creatorName, 
lastModifierName: formData.value.lastModifierName, 
remark: formData.value.remark, 
extraField1: formData.value.extraField1, 
extraField2: formData.value.extraField2, 
extraField3: formData.value.extraField3, 
isSelfMade: formData.value.isSelfMade, 
isValid: formData.value.isValid, 
nullLength: formData.value.nullLength, 
num: formData.value.num, 
selfNum: formData.value.selfNum,  
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark,  
    } 
    if (!current.value) { 
      await wmsMaterialDrawer.addWmsMaterial(data) 
@@ -451,11 +467,16 @@
 
      formData.value = { 
        materialCode: res.materialCode, 
isValid: res.isValid, 
materialName: res.materialName, 
isSelfMade: res.isSelfMade, 
purchaseType: res.purchaseType, 
num: res.num, 
materialType: res.materialType, 
selfNum: res.selfNum, 
primaryUnit: res.primaryUnit, 
standard: res.standard, 
nullLength: res.nullLength, 
outerDiameter: res.outerDiameter, 
wallThickness: res.wallThickness, 
materialQuality: res.materialQuality, 
@@ -466,17 +487,14 @@
redundantField1: res.redundantField1, 
redundantField2: res.redundantField2, 
redundantField3: res.redundantField3, 
remark: res.remark, 
creatorName: res.creatorName, 
lastModifierName: res.lastModifierName, 
remark: res.remark, 
extraField1: res.extraField1, 
extraField2: res.extraField2, 
extraField3: res.extraField3, 
isSelfMade: res.isSelfMade, 
isValid: res.isValid, 
nullLength: res.nullLength, 
num: res.num, 
selfNum: res.selfNum,  
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark,  
        id: res.id, 
      } 
      disabled.value = true 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx

@@ -86,11 +86,27 @@
                   placeholder: '请输入物料编码（唯一标识）', 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'isValid', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
                }, 
                { 
                   label: '数量', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '采购类型（枚举值）', 
@@ -101,12 +117,44 @@
                   placeholder: '请输入采购类型（枚举值）', 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
                }, 
                { 
                   label: '自有数量', 
                   prop: 'selfNum', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入自有数量', 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
@@ -121,6 +169,22 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                }, 
                { 
                   label: '', 
                   prop: 'nullLength', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 0.01,
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                }, 
                { 
                   label: '外径（单位：mm）', 
@@ -235,20 +299,6 @@
                   placeholder: '请输入创建时间', 
                }, 
                { 
                   label: '创建人', 
                   prop: 'creatorName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入创建人', 
                }, 
                { 
                   label: '修改人', 
                   prop: 'lastModifierName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
@@ -262,6 +312,20 @@
                   //disabled: disabled, 
                   placeholder: '请输入是否禁用', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '创建人', 
                   prop: 'creatorName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入创建人', 
                }, 
                { 
                   label: '修改人', 
                   prop: 'lastModifierName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                }, 
                { 
                   label: '扩展字段1', 
@@ -285,68 +349,18 @@
                   placeholder: '请输入扩展字段3', 
                }, 
                { 
                   label: '数量', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'isValid', 
                   el: 'select', 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                }, 
                { 
                   label: '', 
                   prop: 'nullLength', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,
                       clearable: true, 
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 0.01,
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                }, 
                { 
                   label: '是否有效物料', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
                }, 
                { 
                   label: '自有数量', 
                   prop: 'selfNum', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入自有数量', 
                   placeholder: '请输入删除备注', 
                },  
  ]) 
  /** 
@@ -362,11 +376,16 @@
  const commonGetFormData=()=>{ 
    const data = { 
      materialCode: formData.value.materialCode || '', 
isValid: formData.value.isValid || '', 
materialName: formData.value.materialName || '', 
isSelfMade: formData.value.isSelfMade || '', 
purchaseType: formData.value.purchaseType || '', 
num: formData.value.num || '', 
materialType: formData.value.materialType || '', 
selfNum: formData.value.selfNum || '', 
primaryUnit: formData.value.primaryUnit || '', 
standard: formData.value.standard || '', 
nullLength: formData.value.nullLength || '', 
outerDiameter: formData.value.outerDiameter || '', 
wallThickness: formData.value.wallThickness || '', 
materialQuality: formData.value.materialQuality || '', 
@@ -378,18 +397,15 @@
redundantField2: formData.value.redundantField2 || '', 
redundantField3: formData.value.redundantField3 || '', 
creationTime: formData.value.creationTime || '', 
creatorName: formData.value.creatorName || '', 
lastModifierName: formData.value.lastModifierName || '', 
remark: formData.value.remark || '', 
isDisabled: formData.value.isDisabled || '', 
creatorName: formData.value.creatorName || '', 
lastModifierName: formData.value.lastModifierName || '', 
extraField1: formData.value.extraField1 || '', 
extraField2: formData.value.extraField2 || '', 
extraField3: formData.value.extraField3 || '', 
isSelfMade: formData.value.isSelfMade || '', 
isValid: formData.value.isValid || '', 
nullLength: formData.value.nullLength || '', 
num: formData.value.num || '', 
selfNum: formData.value.selfNum || '',  
operationRemark: formData.value.operationRemark || '', 
deleteRemark: formData.value.deleteRemark || '',  
    } 
    return data; 
  } 
@@ -413,11 +429,16 @@
  const onReset = async () => { 
    formData.value = {} 
    formData.value.MaterialCode = '' 
formData.value.IsValid = '' 
formData.value.MaterialName = '' 
formData.value.IsSelfMade = '' 
formData.value.PurchaseType = '' 
formData.value.Num = '' 
formData.value.MaterialType = '' 
formData.value.SelfNum = '' 
formData.value.PrimaryUnit = '' 
formData.value.Standard = '' 
formData.value.NullLength = '' 
formData.value.OuterDiameter = '' 
formData.value.WallThickness = '' 
formData.value.MaterialQuality = '' 
@@ -428,17 +449,14 @@
formData.value.RedundantField1 = '' 
formData.value.RedundantField2 = '' 
formData.value.RedundantField3 = '' 
formData.value.Remark = '' 
formData.value.CreatorName = '' 
formData.value.LastModifierName = '' 
formData.value.Remark = '' 
formData.value.ExtraField1 = '' 
formData.value.ExtraField2 = '' 
formData.value.ExtraField3 = '' 
formData.value.IsSelfMade = '' 
formData.value.IsValid = '' 
formData.value.NullLength = '' 
formData.value.Num = '' 
formData.value.SelfNum = ''  
formData.value.OperationRemark = '' 
formData.value.DeleteRemark = ''  
    //向父组件发送自定义事件 
    ctx.emit('restQuery'); 
  } 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts

@@ -10,9 +10,19 @@
  width:160, 
}, 
{ 
  field: 'isValid', 
  title: '是否有效物料', 
  width:80, 
}, 
{ 
  field: 'materialName', 
  title: '物料名称', 
  width:160, 
}, 
{ 
  field: 'isSelfMade', 
  title: '数量', 
  width:80, 
}, 
{ 
  field: 'purchaseTypeDesc', 
@@ -20,8 +30,18 @@
  width:160, 
}, 
{ 
  field: 'num', 
  title: '是否有效物料', 
  width:160, 
}, 
{ 
  field: 'materialTypeDesc', 
  title: '物料类型（枚举值）', 
  width:160, 
}, 
{ 
  field: 'selfNum', 
  title: '自有数量', 
  width:160, 
}, 
{ 
@@ -32,6 +52,11 @@
{ 
  field: 'standard', 
  title: '规格/标准（如：GB/T 8163-2018）', 
  width:160, 
}, 
{ 
  field: 'nullLength', 
  title: '', 
  width:160, 
}, 
{ 
@@ -90,6 +115,16 @@
  width:180, 
}, 
{ 
  field: 'sort', 
  title: '排序', 
  width:160, 
}, 
{ 
  field: 'remark', 
  title: '备注', 
  width:160, 
}, 
{ 
  field: 'deletionTime', 
  title: '删除时间', 
  width:180, 
@@ -102,16 +137,6 @@
{ 
  field: 'lastModifierName', 
  title: '修改人', 
  width:160, 
}, 
{ 
  field: 'sort', 
  title: '排序', 
  width:160, 
}, 
{ 
  field: 'remark', 
  title: '备注', 
  width:160, 
}, 
{ 
@@ -130,28 +155,13 @@
  width:160, 
}, 
{ 
  field: 'isSelfMade', 
  title: '数量', 
  width:80, 
}, 
{ 
  field: 'isValid', 
  title: '是否有效物料', 
  width:80, 
}, 
{ 
  field: 'nullLength', 
  title: '', 
  field: 'operationRemark', 
  title: '操作备注', 
  width:160, 
}, 
{ 
  field: 'num', 
  title: '是否有效物料', 
  width:160, 
}, 
{ 
  field: 'selfNum', 
  title: '自有数量', 
  field: 'deleteRemark', 
  title: '删除备注', 
  width:160, 
},  
] 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx

@@ -207,7 +207,21 @@
            isHidePagination={isHidePagination} 
            pageSize={20} 
            v-slots={{ 
              creationTime: ({ row }: any) => { 
              isValid: ({ row }: any) => { 
 return ( 
   <div>  
     {row.isValid != null ? (row.isValid ? '是' : '否') : '-'} 
   </div>  
  ) 
},
isSelfMade: ({ row }: any) => { 
 return ( 
   <div>  
     {row.isSelfMade != null ? (row.isSelfMade ? '是' : '否') : '-'} 
   </div>  
  ) 
},
creationTime: ({ row }: any) => { 
 return ( 
   <div>  
     {row.creationTime != null 
@@ -232,15 +246,6 @@
   </div>  
  ) 
},
deletionTime: ({ row }: any) => { 
 return ( 
   <div>  
     {row.deletionTime != null 
     ? dayjs(row.deletionTime).format('YYYY-MM-DD HH:mm:ss') 
      : '-'} 
   </div>  
  ) 
},
isDisabled: ({ row }: any) => { 
 return ( 
   <div>  
@@ -248,17 +253,12 @@
   </div>  
  ) 
},
isSelfMade: ({ row }: any) => { 
deletionTime: ({ row }: any) => { 
 return ( 
   <div>  
     {row.isSelfMade != null ? (row.isSelfMade ? '是' : '否') : '-'} 
   </div>  
  ) 
},
isValid: ({ row }: any) => { 
 return ( 
   <div>  
     {row.isValid != null ? (row.isValid ? '是' : '否') : '-'} 
     {row.deletionTime != null 
     ? dayjs(row.deletionTime).format('YYYY-MM-DD HH:mm:ss') 
      : '-'} 
   </div>  
  ) 
},