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

zs

2025-05-13 0cd95d98fdf7ed22d53398242feb2a3ca185cf09

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

@@ -23,16 +23,34 @@
        public bool IsValid { get; set; }

        /// <summary>
        /// æ˜¯å¦è‡ªäº§
        /// </summary>
        [ExcelColumn(Name = "是否自产", Width = 25)]
        public bool? IsSelfMade { get; set; }

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

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

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

        /// <summary>
        /// æ•°é‡
        /// å¯ç©ºé•¿åº¦
        /// </summary>
        [ExcelColumn(Name = "数量", Width = 25)]
        public bool? IsSelfMade { get; set; }
        [ExcelColumn(Name = "可空长度", Width = 25)]
        public decimal? NullLength { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
@@ -41,22 +59,10 @@
        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、个）
@@ -69,12 +75,6 @@
        /// </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）
@@ -137,22 +137,22 @@
        public string RedundantField3 { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        [ExcelColumn(Name = "排序", Width = 25)]
        public int Sort { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "备注", Width = 25)]
        public string Remark { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }
        [ExcelColumn(Name = "创建时间", Width = 25)]
        public DateTime CreationTime { get; set; }

        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        [ExcelColumn(Name = "修改时间", Width = 25)]
        public DateTime LastModificationTime { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
@@ -165,36 +165,6 @@
        /// </summary>
        [ExcelColumn(Name = "修改人", Width = 25)]
        public string LastModifierName { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
        /// </summary>
        [ExcelColumn(Name = "扩展字段1", Width = 25)]
        public string ExtraField1 { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段2
        /// </summary>
        [ExcelColumn(Name = "扩展字段2", Width = 25)]
        public string ExtraField2 { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段3
        /// </summary>
        [ExcelColumn(Name = "扩展字段3", Width = 25)]
        public string ExtraField3 { get; set; }

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

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "删除备注", Width = 25)]
        public string DeleteRemark { get; set; }