Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

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

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:创建时间

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:

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

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:编号

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
                 {

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,