diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs
index e78a1437..979f226e 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomD.cs
@@ -13,13 +13,6 @@ namespace Tnb.BasicData.Entitys.Entity
 
 
         }
-        /// <summary>
-        /// Desc:主键
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
-        public string id {get;set;}
 
         /// <summary>
         /// Desc:父件物料ID
diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs
index 55996a93..3dcaff75 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs
@@ -13,13 +13,6 @@ namespace Tnb.BasicData.Entitys.Entity
 
 
        }
-       /// <summary>
-       /// Desc:主键
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
-       public string id {get;set;}
 
        /// <summary>
        /// Desc:创建时间
diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs
index 8f1e2913..d67f5249 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs
@@ -12,14 +12,6 @@ namespace Tnb.BasicData.Entitys.Entity
 
 
        }
-       /// <summary>
-       /// Desc:主键
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
-       public string id {get;set;}
-
        /// <summary>
        /// Desc:物料代码
        /// Default:
diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs
index aa548646..7bd37dbd 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasMaterialUnit.cs
@@ -13,13 +13,6 @@ namespace Tnb.BasicData.Entitys.Entity
 
 
        }
-       /// <summary>
-       /// Desc:主键
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
-       public string Id {get;set;}
 
        /// <summary>
        /// Desc:物料ID，BAS_MATERIAL.ID
diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasRoute.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasRoute.cs
index cf1ccfba..f17141a1 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasRoute.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasRoute.cs
@@ -17,13 +17,6 @@ namespace Tnb.BasicData.Entitys.Entity
 
 
        }
-       /// <summary>
-       /// Desc:主键
-       /// Default:
-       /// Nullable:False
-       /// </summary>           
-       [SugarColumn(IsPrimaryKey=true,ColumnName="id")]
-       public string Id {get;set;}
 
        /// <summary>
        /// Desc:编号
diff --git a/BasicData/Tnb.BasicData/EbomService.cs b/BasicData/Tnb.BasicData/EbomService.cs
index 58dc8dc2..080d490f 100644
--- a/BasicData/Tnb.BasicData/EbomService.cs
+++ b/BasicData/Tnb.BasicData/EbomService.cs
@@ -50,10 +50,10 @@ namespace Tnb.BasicData
             if (string.IsNullOrEmpty(queryInput.materialId))
             {
                 var data =  await db.Queryable<BasEbomD>()
-                    .LeftJoin<BasEbomH>((a,b)=>a.ebom_id==b.Id)
-                    .LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.Id)
+                    .LeftJoin<BasEbomH>((a,b)=>a.ebom_id==b.id)
+                    .LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.id)
                     .LeftJoin<BasEbomH>((a,b,c,d)=>a.material_id==d.material_id)
-                    .LeftJoin<BasRoute>((a,b,c,d,e)=>d.route_id==e.Id)
+                    .LeftJoin<BasRoute>((a,b,c,d,e)=>d.route_id==e.id)
                     .LeftJoin<BasMaterial>((a,b,c,d,e,f)=>a.substitute_material_id==f.id)
                     .Where((a,b,c)=>a.ebom_id==queryInput.ebomId)
                     .Select((a,b,c,d,e,f)=>new EbomTreeOutput
@@ -79,12 +79,12 @@ namespace Tnb.BasicData
             else
             {
                 var data =  await db.Queryable<BasEbomD>()
-                    .LeftJoin<BasEbomH>((a,b)=>a.ebom_id==b.Id)
-                    .LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.Id)
+                    .LeftJoin<BasEbomH>((a,b)=>a.ebom_id==b.id)
+                    .LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.id)
                     .LeftJoin<BasEbomH>((a,b,c,d)=>a.material_id==d.material_id)
-                    .LeftJoin<BasRoute>((a,b,c,d,e)=>d.route_id==e.Id)
+                    .LeftJoin<BasRoute>((a,b,c,d,e)=>d.route_id==e.id)
                     .LeftJoin<BasMaterial>((a,b,c,d,e,f)=>a.substitute_material_id==f.id)
-                    .Where((a,b,c)=>b.material_id==queryInput.materialId && a.ebom_id==b.Id)
+                    .Where((a,b,c)=>b.material_id==queryInput.materialId && a.ebom_id==b.id)
                     .Select((a,b,c,d,e,f)=>new EbomTreeOutput
                     {
                         material_id = c.name,
@@ -121,7 +121,7 @@ namespace Tnb.BasicData
             // }
 
             var ebom = await db.Queryable<BasEbomH>()
-                .LeftJoin<BasRoute>((a,b)=>a.route_id==b.Id)
+                .LeftJoin<BasRoute>((a,b)=>a.route_id==b.id)
                 .Where((a,b) => a.material_id == materialId)
                 .Select((a,b)=>new
                 {
diff --git a/BasicData/Tnb.BasicData/MaterialService.cs b/BasicData/Tnb.BasicData/MaterialService.cs
index 89f6027a..af81ef71 100644
--- a/BasicData/Tnb.BasicData/MaterialService.cs
+++ b/BasicData/Tnb.BasicData/MaterialService.cs
@@ -41,7 +41,7 @@ namespace Tnb.BasicData
             // }
 
             var ebom = await db.Queryable<BasEbomH>()
-                .LeftJoin<BasRoute>((a,b)=>a.route_id==b.Id)
+                .LeftJoin<BasRoute>((a,b)=>a.route_id==b.id)
                 .Where((a,b) => a.material_id == materialId)
                 .Select((a,b)=>new
                 {
@@ -67,7 +67,7 @@ namespace Tnb.BasicData
             string typeId = type?.Id;
             var queryable1 =  db.Queryable<BasMaterial>()
                 .LeftJoin<DictionaryDataEntity>((a,b)=>a.unit_id==b.EnCode && b.DictionaryTypeId==typeId)
-                .Where((a,b) => a.Id == materialId)
+                .Where((a,b) => a.id == materialId)
                 .Select((a,b)=> new ElementSelectDto
                 {
                     value = b.EnCode,
@@ -75,7 +75,7 @@ namespace Tnb.BasicData
                 });
             var queryable2 =  db.Queryable<BasMaterial>()
                 .LeftJoin<DictionaryDataEntity>((a,b)=>a.pickunit_id==b.EnCode && b.DictionaryTypeId==typeId)
-                .Where((a,b) => a.Id == materialId)
+                .Where((a,b) => a.id == materialId)
                 .Select((a,b)=> new ElementSelectDto
                 {
                     value = b.EnCode,
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
index 648b7b9a..82baa1b1 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
@@ -10,7 +10,7 @@ namespace Tnb.ProductionMgr.Entitys.Dto
     /// <summary>
     /// 设备列表输出参数
     /// </summary>
-    public class EquipmentListOutput : EqpEquipment
+    public class EquipmentListOutput //: EqpEquipment 不能直接继承实体类
     {
         /// <summary>
         /// 任务单数量
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj b/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj
index 24542167..a13ba3ff 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj
+++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
     <ProjectReference Include="..\..\common\Tnb.Common\Tnb.Common.csproj" />
   </ItemGroup>
 
diff --git a/ProductionMgr/Tnb.ProductionMgr/WorkOrderSchedulingService.cs b/ProductionMgr/Tnb.ProductionMgr/WorkOrderSchedulingService.cs
index 5f22f719..00867a52 100644
--- a/ProductionMgr/Tnb.ProductionMgr/WorkOrderSchedulingService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/WorkOrderSchedulingService.cs
@@ -50,7 +50,7 @@ namespace Tnb.ProductionMgr
             foreach (var item in multi)
             {
                 MoldsEntity entity = new();
-                entity.Id = SnowflakeIdHelper.NextId();
+                entity.id = SnowflakeIdHelper.NextId();
                 entity.MoldCode = $"m00{index}";
                 entity.MoldName = "磨具" + index;
                 entity.ItemId = item.pId;
@@ -68,7 +68,7 @@ namespace Tnb.ProductionMgr
                     var dic = new Dictionary<string, object>
                     {
                         {"id",item.EqpId },
-                        { "mold_id", item.Id} 
+                        { "mold_id", item.id} 
                     };
                     var row2 = await db.Updateable(dic).AS("eqp_equipment")
                         .WhereColumns("id").
diff --git a/common/Tnb.Common/Contracts/BaseEntity`1.cs b/common/Tnb.Common/Contracts/BaseEntity`1.cs
index 8ed80155..8a05aeef 100644
--- a/common/Tnb.Common/Contracts/BaseEntity`1.cs
+++ b/common/Tnb.Common/Contracts/BaseEntity`1.cs
@@ -8,13 +8,13 @@ using SqlSugar;
 
 namespace Tnb.Common.Contracts
 {
-    public class BaseEntity<TKey> : IEntity<TKey> where TKey : IEquatable<TKey>
+    public class BaseEntity<TKey> : IEntity where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// 获取或设置 编号.
         /// </summary>
         [SugarColumn(ColumnName = "id", ColumnDescription = "主键", IsPrimaryKey = true)]
-        public TKey Id { get; set; }
+        public TKey id { get; set; }
     }
 
 }
diff --git a/common/Tnb.Common/Contracts/IEntity.cs b/common/Tnb.Common/Contracts/IEntity.cs
index ccf240f5..29131e3d 100644
--- a/common/Tnb.Common/Contracts/IEntity.cs
+++ b/common/Tnb.Common/Contracts/IEntity.cs
@@ -3,10 +3,15 @@
 /// <summary>
 /// 实体类基类.
 /// </summary>
-public interface IEntity<TKey>
+public interface IEntity<TKey> : IEntity
 {
     /// <summary>
     /// 获取或设置 实体唯一标识，主键.
     /// </summary>
     TKey Id { get; set; }
+}
+
+public interface IEntity
+{
+
 }
\ No newline at end of file
diff --git a/dotnet.ruleset b/dotnet.ruleset
index 2dfee6b2..4983117f 100644
--- a/dotnet.ruleset
+++ b/dotnet.ruleset
@@ -52,6 +52,7 @@
     <Rule Id="IDE0007WithoutSuggestion" Action="None" />
     <Rule Id="IDE0008" Action="None" />
     <Rule Id="IDE0079" Action="Hidden" />
+    <Rule Id="IDE1006" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
     <Rule Id="CA1707" Action="None" />