diff --git a/ZR.Model/MES/md/MdBom.cs~合并 b/ZR.Model/MES/md/MdBom.cs~合并
new file mode 100644
index 00000000..007a62f8
--- /dev/null
+++ b/ZR.Model/MES/md/MdBom.cs~合并
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace ZR.Model.mes.md
+{
+    /// <summary>
+    /// 物料清单
+    ///</summary>
+    [SugarTable("md_bom")]
+    public class MdBom
+    {
+
+        /// <summary>
+        /// 流水号 
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 父产品id 
+        ///</summary>
+        [SugarColumn(ColumnName = "parent_product_id")]
+        public int? ParentProductId { get; set; }
+
+        /// <summary>
+        /// 产品编号 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_code")]
+        public string ProductCode { get; set; }
+        /// <summary>
+        /// 产品名称 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_name")]
+        public string ProductName { get; set; }
+        /// <summary>
+        /// 零件类型 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_type")]
+        public string ProductType { get; set; }
+        /// <summary>
+        /// 安全库存 
+        ///</summary>
+        [SugarColumn(ColumnName = "safety_stock")]
+        public int? SafetyStock { get; set; }
+        /// <summary>
+        /// 位置/来源 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_position")]
+        public string ProductPosition { get; set; }
+        /// <summary>
+        /// 需求数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "requireNum")]
+        public int? RequireNum { get; set; }
+        /// <summary>
+        /// 单位id 
+        ///</summary>
+        [SugarColumn(ColumnName = "unit_id")]
+        public int? UnitId { get; set; }
+        /// <summary>
+        /// 租户号 
+        ///</summary>
+        [SugarColumn(ColumnName = "TENANT_ID")]
+        public string TenantId { get; set; }
+        /// <summary>
+        /// 乐观锁 
+        ///</summary>
+        [SugarColumn(ColumnName = "REVISION")]
+        public int? Revision { get; set; }
+        /// <summary>
+        /// 创建人 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_BY")]
+        public string CreatedBy { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+        /// <summary>
+        /// 更新人 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_BY")]
+        public string UpdatedBy { get; set; }
+        /// <summary>
+        /// 更新时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public List<MdBom> Child { get; set; }
+
+    }
+}
diff --git a/ZR.Model/mes/md/MdBom.cs b/ZR.Model/mes/md/MdBom.cs
new file mode 100644
index 00000000..007a62f8
--- /dev/null
+++ b/ZR.Model/mes/md/MdBom.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace ZR.Model.mes.md
+{
+    /// <summary>
+    /// 物料清单
+    ///</summary>
+    [SugarTable("md_bom")]
+    public class MdBom
+    {
+
+        /// <summary>
+        /// 流水号 
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 父产品id 
+        ///</summary>
+        [SugarColumn(ColumnName = "parent_product_id")]
+        public int? ParentProductId { get; set; }
+
+        /// <summary>
+        /// 产品编号 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_code")]
+        public string ProductCode { get; set; }
+        /// <summary>
+        /// 产品名称 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_name")]
+        public string ProductName { get; set; }
+        /// <summary>
+        /// 零件类型 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_type")]
+        public string ProductType { get; set; }
+        /// <summary>
+        /// 安全库存 
+        ///</summary>
+        [SugarColumn(ColumnName = "safety_stock")]
+        public int? SafetyStock { get; set; }
+        /// <summary>
+        /// 位置/来源 
+        ///</summary>
+        [SugarColumn(ColumnName = "product_position")]
+        public string ProductPosition { get; set; }
+        /// <summary>
+        /// 需求数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "requireNum")]
+        public int? RequireNum { get; set; }
+        /// <summary>
+        /// 单位id 
+        ///</summary>
+        [SugarColumn(ColumnName = "unit_id")]
+        public int? UnitId { get; set; }
+        /// <summary>
+        /// 租户号 
+        ///</summary>
+        [SugarColumn(ColumnName = "TENANT_ID")]
+        public string TenantId { get; set; }
+        /// <summary>
+        /// 乐观锁 
+        ///</summary>
+        [SugarColumn(ColumnName = "REVISION")]
+        public int? Revision { get; set; }
+        /// <summary>
+        /// 创建人 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_BY")]
+        public string CreatedBy { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+        /// <summary>
+        /// 更新人 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_BY")]
+        public string UpdatedBy { get; set; }
+        /// <summary>
+        /// 更新时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public List<MdBom> Child { get; set; }
+
+    }
+}