From 2c9d9b9ad5a87b10703727ddefec818dd5bebb38 Mon Sep 17 00:00:00 2001 From: PhilPan Date: Wed, 26 Apr 2023 10:18:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj | 1 - ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) 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 @@ - diff --git a/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj b/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj index ca94d7da..dc0d6697 100644 --- a/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj +++ b/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj @@ -9,6 +9,8 @@ + + From 5d6e9265a8ccc9bd449fe3256c7008ec6416b8f0 Mon Sep 17 00:00:00 2001 From: PhilPan Date: Wed, 26 Apr 2023 10:44:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89IDE1006=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9BaseEntity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.BasicData.Entitys/Entity/BasEbomD.cs | 7 ------- .../Tnb.BasicData.Entitys/Entity/BasEbomH.cs | 7 ------- .../Tnb.BasicData.Entitys/Entity/BasMaterial.cs | 8 -------- .../Entity/BasMaterialUnit.cs | 7 ------- .../Tnb.BasicData.Entitys/Entity/BasRoute.cs | 7 ------- BasicData/Tnb.BasicData/EbomService.cs | 16 ++++++++-------- BasicData/Tnb.BasicData/MaterialService.cs | 6 +++--- .../Dto/PrdManage/EquipmentListOutput.cs | 2 +- .../WorkOrderSchedulingService.cs | 4 ++-- common/Tnb.Common/Contracts/BaseEntity`1.cs | 4 ++-- common/Tnb.Common/Contracts/IEntity.cs | 7 ++++++- dotnet.ruleset | 1 + 12 files changed, 23 insertions(+), 53 deletions(-) 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 } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true,ColumnName="id")] - public string id {get;set;} /// /// 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 } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true,ColumnName="id")] - public string id {get;set;} /// /// 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 } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true,ColumnName="id")] - public string id {get;set;} - /// /// 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 } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true,ColumnName="id")] - public string Id {get;set;} /// /// 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 } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true,ColumnName="id")] - public string Id {get;set;} /// /// 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() - .LeftJoin((a,b)=>a.ebom_id==b.Id) - .LeftJoin((a,b,c)=>a.material_id==c.Id) + .LeftJoin((a,b)=>a.ebom_id==b.id) + .LeftJoin((a,b,c)=>a.material_id==c.id) .LeftJoin((a,b,c,d)=>a.material_id==d.material_id) - .LeftJoin((a,b,c,d,e)=>d.route_id==e.Id) + .LeftJoin((a,b,c,d,e)=>d.route_id==e.id) .LeftJoin((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() - .LeftJoin((a,b)=>a.ebom_id==b.Id) - .LeftJoin((a,b,c)=>a.material_id==c.Id) + .LeftJoin((a,b)=>a.ebom_id==b.id) + .LeftJoin((a,b,c)=>a.material_id==c.id) .LeftJoin((a,b,c,d)=>a.material_id==d.material_id) - .LeftJoin((a,b,c,d,e)=>d.route_id==e.Id) + .LeftJoin((a,b,c,d,e)=>d.route_id==e.id) .LeftJoin((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() - .LeftJoin((a,b)=>a.route_id==b.Id) + .LeftJoin((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() - .LeftJoin((a,b)=>a.route_id==b.Id) + .LeftJoin((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() .LeftJoin((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() .LeftJoin((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 ddda31cc..c079a8cf 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 /// /// 设备列表输出参数 /// - public class EquipmentListOutput : EqpEquipment + public class EquipmentListOutput //: EqpEquipment 不能直接继承实体类 { /// /// 任务单数量 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 { {"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 : IEntity where TKey : IEquatable + public class BaseEntity : IEntity where TKey : IEquatable { /// /// 获取或设置 编号. /// [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 @@ /// /// 实体类基类. /// -public interface IEntity +public interface IEntity : IEntity { /// /// 获取或设置 实体唯一标识，主键. /// 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 @@ +