Merge remote-tracking branch 'origin/master'

啊鑫

2025-07-07 79e43ccffd15afcd99934ee43b706f6133398079

 MES.Service/Modes/BOM/MesBomMaster.cs

@@ -11,40 +11,47 @@
    public class MesBomMaster
    {
        /// <summary>
        ///     SEQ_BOM
        /// </summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BOM",
            IsPrimaryKey = true)]
        public decimal Id { get; set; }

        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ERPID", IsPrimaryKey = true)]
        [SugarColumn(ColumnName="ERPID")]
         public decimal? Erpid { get; set; }
        /// <summary>
        /// 单据类型 
        ///</summary>
         [SugarColumn(ColumnName="FBILLTYPE"    )]
         public string Fbilltype { get; set; }
         public string? Fbilltype { get; set; }
        /// <summary>
        /// BOM分类 
        ///</summary>
         [SugarColumn(ColumnName="FBOMCATEGORY"    )]
         public string Fbomcategory { get; set; }
         public string? Fbomcategory { get; set; }
        /// <summary>
        /// BOM用途 
        ///</summary>
         [SugarColumn(ColumnName="FBOMUSE"    )]
         public string Fbomuse { get; set; }
         public string? Fbomuse { get; set; }
        /// <summary>
        /// BOM分组 
        ///</summary>
         [SugarColumn(ColumnName="FGROUP"    )]
         public string Fgroup { get; set; }
         public string? Fgroup { get; set; }
        /// <summary>
        /// BOM编码 
        ///</summary>
         [SugarColumn(ColumnName="FNUMBER"    )]
         public string Fnumber { get; set; }
         public string? Fnumber { get; set; }
        /// <summary>
        /// BOM版本号 
        ///</summary>
         [SugarColumn(ColumnName="F_UNW_BOM_BB"    )]
         public string FUnwBomBb { get; set; }
         public string? FUnwBomBb { get; set; }
        /// <summary>
        /// 生效日期 
        ///</summary>
@@ -59,22 +66,22 @@
        /// 父项物料编码 
        ///</summary>
         [SugarColumn(ColumnName="FMATERIALID"    )]
         public string Fmaterialid { get; set; }
         public string? Fmaterialid { get; set; }
        /// <summary>
        /// 父项物料名称 
        ///</summary>
         [SugarColumn(ColumnName="FITEMNAME"    )]
         public string Fitemname { get; set; }
         public string? Fitemname { get; set; }
        /// <summary>
        /// 计量单位 
        ///</summary>
         [SugarColumn(ColumnName="FBASEUNITID"    )]
         public string Fbaseunitid { get; set; }
         public string? Fbaseunitid { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
         [SugarColumn(ColumnName="FCREATORID"    )]
         public string Fcreatorid { get; set; }
         public string? Fcreatorid { get; set; }
        /// <summary>
        /// 创建时间 
        ///</summary>
@@ -84,17 +91,17 @@
        /// 物料属性 
        ///</summary>
         [SugarColumn(ColumnName="FITEMPPROPERTY"    )]
         public string Fitempproperty { get; set; }
         public string? Fitempproperty { get; set; }
        /// <summary>
        /// 描述 
        ///</summary>
         [SugarColumn(ColumnName="FDESCRIPTION"    )]
         public string Fdescription { get; set; }
         public string? Fdescription { get; set; }
        /// <summary>
        /// 修改人 
        ///</summary>
         [SugarColumn(ColumnName="FMODIFIERID"    )]
         public string Fmodifierid { get; set; }
         public string? Fmodifierid { get; set; }
        /// <summary>
        /// 修改时间 
        ///</summary>
@@ -104,7 +111,7 @@
        /// 审核人 
        ///</summary>
         [SugarColumn(ColumnName="FAPPROVERID"    )]
         public string Fapproverid { get; set; }
         public string? Fapproverid { get; set; }
        /// <summary>
        /// 审核时间 
        ///</summary>
@@ -114,17 +121,17 @@
        /// 禁用原因 
        ///</summary>
         [SugarColumn(ColumnName="FFORBIDRESON"    )]
         public string Fforbidreson { get; set; }
         public string? Fforbidreson { get; set; }
        /// <summary>
        /// 禁用状态 
        ///</summary>
         [SugarColumn(ColumnName="FFORBIDSTATUS"    )]
         public string Fforbidstatus { get; set; }
         public string? Fforbidstatus { get; set; }
        /// <summary>
        /// 禁用人 
        ///</summary>
         [SugarColumn(ColumnName="FFORBIDDERID"    )]
         public string Fforbidderid { get; set; }
         public string? Fforbidderid { get; set; }
        /// <summary>
        /// 禁用日期 
        ///</summary>
@@ -134,26 +141,26 @@
        /// 创建组织 
        ///</summary>
         [SugarColumn(ColumnName="CREATE_ORGANIZATION"    )]
         public string CreateOrganization { get; set; }
         public string? CreateOrganization { get; set; }
        /// <summary>
        /// 使用组织 
        ///</summary>
         [SugarColumn(ColumnName="USING_ORGANIZATION"    )]
         public string UsingOrganization { get; set; }
         public string? UsingOrganization { get; set; }
        /// <summary>
        /// 工艺路线 
        ///</summary>
         [SugarColumn(ColumnName="ROUTING"    )]
         public string Routing { get; set; }
         public string? Routing { get; set; }
        /// <summary>
        /// 贴片工艺 
        ///</summary>
         [SugarColumn(ColumnName="F_UNW_TEXT_TPGY"    )]
         public string FUnwTextTpgy { get; set; }
         public string? FUnwTextTpgy { get; set; }
        /// <summary>
        /// BOM更新类型 
        ///</summary>
         [SugarColumn(ColumnName="BOM_UPDATE_TYPE"    )]
         public string BomUpdateType { get; set; }
         public string? BomUpdateType { get; set; }
    }
}