diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasCustomer.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasCustomer.cs index 5d851bc9..f26e8331 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasCustomer.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasCustomer.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 客户信息 +/// +[SugarTable("bas_customer")] +public partial class BasCustomer : BaseEntity { - /// - ///客户信息 - /// - [SugarTable("bas_customer")] - public partial class BasCustomer + public BasCustomer() { - public BasCustomer(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:客户代码 - /// Default: - /// Nullable:False - /// - public string customer_code {get;set;} = string.Empty; - - /// - /// Desc:客户名称 - /// Default: - /// Nullable:False - /// - public string customer_name {get;set;} = string.Empty; - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:客户简称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? short_name {get;set;} - - /// - /// Desc:详细地址 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? full_address {get;set;} - - /// - /// Desc:邮编 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? postal_code {get;set;} - - /// - /// Desc:国家 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? country {get;set;} - - /// - /// Desc:省 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? province {get;set;} - - /// - /// Desc:市 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? city {get;set;} - - /// - /// Desc:区 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? district {get;set;} - - /// - /// Desc:街道地址 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? street {get;set;} - - /// - /// Desc:联系人名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_name {get;set;} - - /// - /// Desc:联系人电话 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_phone {get;set;} - - /// - /// Desc:联系人手机 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_mobile {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 客户代码 + /// + public string customer_code { get; set; } = string.Empty; + + /// + /// 客户名称 + /// + public string customer_name { get; set; } = string.Empty; + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 客户简称 + /// + public string? short_name { get; set; } + + /// + /// 详细地址 + /// + public string? full_address { get; set; } + + /// + /// 邮编 + /// + public string? postal_code { get; set; } + + /// + /// 国家 + /// + public string? country { get; set; } + + /// + /// 省 + /// + public string? province { get; set; } + + /// + /// 市 + /// + public string? city { get; set; } + + /// + /// 区 + /// + public string? district { get; set; } + + /// + /// 街道地址 + /// + public string? street { get; set; } + + /// + /// 联系人名称 + /// + public string? contact_name { get; set; } + + /// + /// 联系人电话 + /// + public string? contact_phone { get; set; } + + /// + /// 联系人手机 + /// + public string? contact_mobile { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasDefect.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasDefect.cs index 44ba8c03..ebae855d 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasDefect.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasDefect.cs @@ -1,7 +1,6 @@ using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; namespace Tnb.BasicData.Entities; @@ -18,61 +17,51 @@ public partial class BasDefect : BaseEntity /// /// 排序 /// - [SugarColumn(IsNullable = true)] public long? ordinal { get; set; } /// /// 创建用户 /// - [SugarColumn(IsNullable = true)] public string? create_id { get; set; } /// /// 创建时间 /// - [SugarColumn(IsNullable = true)] public DateTime? create_time { get; set; } /// /// 修改用户 /// - [SugarColumn(IsNullable = true)] public string? modify_id { get; set; } /// /// 修改时间 /// - [SugarColumn(IsNullable = true)] public DateTime? modify_time { get; set; } /// /// 扩展字段 /// - [SugarColumn(IsNullable = true)] public string? extras { get; set; } /// /// 备注 /// - [SugarColumn(IsNullable = true)] public string? remark { get; set; } /// /// 次品类型 /// - [SugarColumn(IsNullable = true)] public string? defect_type_id { get; set; } /// /// 缺陷代码 /// - [SugarColumn(IsNullable = true)] public string? defect_code { get; set; } /// /// 缺陷名称 /// - [SugarColumn(IsNullable = true)] public string? defect_name { get; set; } /// diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasDefectType.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasDefectType.cs index c37660ab..0f0f71bc 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasDefectType.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasDefectType.cs @@ -1,84 +1,57 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 次品分类 +/// +[SugarTable("bas_defect_type")] +public partial class BasDefectType : BaseEntity { - /// - ///次品分类 - /// - [SugarTable("bas_defect_type")] - public partial class BasDefectType + public BasDefectType() { - public BasDefectType(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:次品类名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? defect_type_name {get;set;} - - /// - /// Desc:次品类代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? defect_type_code {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public short enabled {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 次品类名称 + /// + public string? defect_type_name { get; set; } + + /// + /// 次品类代码 + /// + public string? defect_type_code { get; set; } + + /// + /// 是否启用 + /// + public short enabled { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasDoc.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasDoc.cs index b76d4377..aa0753f7 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasDoc.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasDoc.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 文档数据表 +/// +[SugarTable("bas_doc")] +public partial class BasDoc : BaseEntity { - /// - ///文档数据表 - /// - [SugarTable("bas_doc")] - public partial class BasDoc + public BasDoc() { - public BasDoc(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:文档编号 - /// Default: - /// Nullable:False - /// - public string doc_code {get;set;} = string.Empty; - - /// - /// Desc:文档名称 - /// Default: - /// Nullable:False - /// - public string doc_name {get;set;} = string.Empty; - - /// - /// Desc:文档后缀 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? doc_extension {get;set;} - - /// - /// Desc:文档唯一码 GUID 的文本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? doc_unique_code {get;set;} - - /// - /// Desc:文档版本 - /// Default: - /// Nullable:False - /// - public decimal doc_version {get;set;} - - /// - /// Desc:文档目录代码 - /// Default: - /// Nullable:False - /// - public string direcrory_code {get;set;} = string.Empty; - - /// - /// Desc:文档类型代码 - /// Default: - /// Nullable:False - /// - public string doc_type_code {get;set;} = string.Empty; - - /// - /// Desc:对应产品，没有实际意义，初次设定 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:0-未审核，1-审核中，2-审核通过，3-未通过 - /// Default: - /// Nullable:True - /// - public int? status {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发管理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 文档编号 + /// + public string doc_code { get; set; } = string.Empty; + + /// + /// 文档名称 + /// + public string doc_name { get; set; } = string.Empty; + + /// + /// 文档后缀 + /// + public string? doc_extension { get; set; } + + /// + /// 文档唯一码 GUID 的文本 + /// + public string? doc_unique_code { get; set; } + + /// + /// 文档版本 + /// + public decimal doc_version { get; set; } + + /// + /// 文档目录代码 + /// + public string direcrory_code { get; set; } = string.Empty; + + /// + /// 文档类型代码 + /// + public string doc_type_code { get; set; } = string.Empty; + + /// + /// 对应产品，没有实际意义，初次设定 + /// + public string? item_code { get; set; } + + /// + /// 0-未审核，1-审核中，2-审核通过，3-未通过 + /// + public int? status { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发管理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasDocDirectory.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasDocDirectory.cs index 3ae2e564..37d7633d 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasDocDirectory.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasDocDirectory.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 文档目录 +/// +[SugarTable("bas_doc_directory")] +public partial class BasDocDirectory : BaseEntity { - /// - ///文档目录 - /// - [SugarTable("bas_doc_directory")] - public partial class BasDocDirectory + public BasDocDirectory() { - public BasDocDirectory(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:父级目录ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:文档目录代码 - /// Default: - /// Nullable:False - /// - public string directory_code {get;set;} = string.Empty; - - /// - /// Desc:文档目录名称 - /// Default: - /// Nullable:False - /// - public string directory_name {get;set;} = string.Empty; - - /// - /// Desc:目录下文件是否需要审核 - /// Default: - /// Nullable:False - /// - public string need_review {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 父级目录ID + /// + public string? parent_id { get; set; } + + /// + /// 文档目录代码 + /// + public string directory_code { get; set; } = string.Empty; + + /// + /// 文档目录名称 + /// + public string directory_name { get; set; } = string.Empty; + + /// + /// 目录下文件是否需要审核 + /// + public string need_review { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasDocType.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasDocType.cs index d82f83ed..4984bfa0 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasDocType.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasDocType.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 文档类型 +/// +[SugarTable("bas_doc_type")] +public partial class BasDocType : BaseEntity { - /// - ///文档类型 - /// - [SugarTable("bas_doc_type")] - public partial class BasDocType + public BasDocType() { - public BasDocType(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:文档类型代码 - /// Default: - /// Nullable:False - /// - public string doc_type_code {get;set;} = string.Empty; - - /// - /// Desc:文档类型名称 - /// Default: - /// Nullable:False - /// - public string doc_type_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 文档类型代码 + /// + public string doc_type_code { get; set; } = string.Empty; + + /// + /// 文档类型名称 + /// + public string doc_type_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs index 367fcc59..fd9ec3fd 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料清单子表 +/// +[SugarTable("bas_ebom_d")] +public partial class BasEbomD : BaseEntity { - /// - ///物料清单子表 - /// - [SugarTable("bas_ebom_d")] - public partial class BasEbomD + public BasEbomD() { - public BasEbomD(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:父件物料ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? ebom_id {get;set;} - - /// - /// Desc:物料编号/名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:单位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_id {get;set;} - - /// - /// Desc:数量 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? quantity {get;set;} - - /// - /// Desc:损耗率 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? loss_rate {get;set;} - - /// - /// Desc:替代物料 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? substitute_material_id {get;set;} - - /// - /// Desc:投料管控 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? feeding_control {get;set;} - - /// - /// Desc:需要称量 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_weight {get;set;} - - /// - /// Desc:版本号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? version {get;set;} - - /// - /// Desc:工艺路线 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_id {get;set;} - - /// - /// Desc:工艺路线名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 父件物料ID + /// + public string? ebom_id { get; set; } + + /// + /// 物料编号/名称 + /// + public string? material_id { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 单位id + /// + public string? unit_id { get; set; } + + /// + /// 数量 + /// + public string? quantity { get; set; } + + /// + /// 损耗率 + /// + public string? loss_rate { get; set; } + + /// + /// 替代物料 + /// + public string? substitute_material_id { get; set; } + + /// + /// 投料管控 + /// + public string? feeding_control { get; set; } + + /// + /// 需要称量 + /// + public string? require_weight { get; set; } + + /// + /// 版本号 + /// + public string? version { get; set; } + + /// + /// 工艺路线 + /// + public string? route_id { get; set; } + + /// + /// 工艺路线名称 + /// + public string? route_name { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasEbomH.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomH.cs index 28d16f78..75de569c 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasEbomH.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomH.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料清单父表 +/// +[SugarTable("bas_ebom_h")] +public partial class BasEbomH : BaseEntity { - /// - ///物料清单父表 - /// - [SugarTable("bas_ebom_h")] - public partial class BasEbomH + public BasEbomH() { - public BasEbomH(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:成品物料编号/名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:数量 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? quantity {get;set;} - - /// - /// Desc:单位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_id {get;set;} - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:版本号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? version {get;set;} - - /// - /// Desc:工艺路线id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_id {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:仅用于关联表字段查询用不存储数据 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? query_info {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 成品物料编号/名称 + /// + public string? material_id { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 数量 + /// + public string? quantity { get; set; } + + /// + /// 单位id + /// + public string? unit_id { get; set; } + + /// + /// 状态 + /// + public string? status { get; set; } + + /// + /// 版本号 + /// + public string? version { get; set; } + + /// + /// 工艺路线id + /// + public string? route_id { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 仅用于关联表字段查询用不存储数据 + /// + public string? query_info { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasFactory.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasFactory.cs index 09ae9aa3..90f06c1f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasFactory.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasFactory.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工厂资料 +/// +[SugarTable("bas_factory")] +public partial class BasFactory : BaseEntity { - /// - ///工厂资料 - /// - [SugarTable("bas_factory")] - public partial class BasFactory + public BasFactory() { - public BasFactory(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:工厂名称 - /// Default: - /// Nullable:False - /// - public string factory_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 工厂名称 + /// + public string factory_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasItem.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasItem.cs deleted file mode 100644 index 6070e9d0..00000000 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasItem.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.Linq; -using System.Text; -using SqlSugar; - -namespace Tnb.BasicData.Entitys.Entity -{ - /// - ///产品信息 - /// - [SugarTable("bas_product")] - public partial class BasItem - { - public BasItem(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string product_code { get;set;} - - /// - /// Desc:产品分类ID - /// Default: - /// Nullable:False - /// - public string categoryid {get;set;} - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:True - /// - public decimal? relation_ratio {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string extras {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string org_id {get;set;} - - /// - /// Desc:产品名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string product_name { get;set;} - - /// - /// Desc:产品规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string product_standard { get;set;} - - /// - /// Desc:物料ID，BAS_MATERIAL.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string material_id {get;set;} - - /// - /// Desc:产品类型： 半成品：SemiManufacture 成品：FinishedProduct - /// Default:NULL::character varying - /// Nullable:True - /// - public string product_type { get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string create_id {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string modify_id {get;set;} - - } -} diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelParameter.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelParameter.cs index ccdc0144..488688ff 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelParameter.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelParameter.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 标签参数维护 +/// +[SugarTable("bas_label_parameter")] +public partial class BasLabelParameter : BaseEntity { - /// - ///标签参数维护 - /// - [SugarTable("bas_label_parameter")] - public partial class BasLabelParameter + public BasLabelParameter() { - public BasLabelParameter(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:标签参数代码 - /// Default: - /// Nullable:False - /// - public string parameter_code {get;set;} = string.Empty; - - /// - /// Desc:标签参数名称 - /// Default: - /// Nullable:False - /// - public string parameter_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 标签参数代码 + /// + public string parameter_code { get; set; } = string.Empty; + + /// + /// 标签参数名称 + /// + public string parameter_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelRule.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelRule.cs index f7d0f0c2..eb8c2ece 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelRule.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelRule.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 条码标签规则 +/// +[SugarTable("bas_label_rule")] +public partial class BasLabelRule : BaseEntity { - /// - ///条码标签规则 - /// - [SugarTable("bas_label_rule")] - public partial class BasLabelRule + public BasLabelRule() { - public BasLabelRule(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:规则代码 - /// Default: - /// Nullable:False - /// - public string rule_code {get;set;} = string.Empty; - - /// - /// Desc:规则名称 - /// Default: - /// Nullable:False - /// - public string rule_name {get;set;} = string.Empty; - - /// - /// Desc:条码类型(数据字典): MaterialLot:批次物料条码； MaterialKeyparts:单件物料条码； Product:产品条码； Carton:箱号条码； Pallet:栈板条码； - /// Default: - /// Nullable:False - /// - public string sn_type {get;set;} = string.Empty; - - /// - /// Desc:前缀 - /// Default: - /// Nullable:False - /// - public string prefix {get;set;} = string.Empty; - - /// - /// Desc:年度 - /// Default: - /// Nullable:False - /// - public int year {get;set;} - - /// - /// Desc:季度 - /// Default: - /// Nullable:False - /// - public int quarter {get;set;} - - /// - /// Desc:月份 - /// Default: - /// Nullable:False - /// - public int month {get;set;} - - /// - /// Desc:周别 - /// Default: - /// Nullable:False - /// - public int week {get;set;} - - /// - /// Desc:日期 - /// Default: - /// Nullable:False - /// - public int date {get;set;} - - /// - /// Desc:流水码长度 - /// Default: - /// Nullable:False - /// - public int serial_lenth {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:系统类型 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? system_type {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 规则代码 + /// + public string rule_code { get; set; } = string.Empty; + + /// + /// 规则名称 + /// + public string rule_name { get; set; } = string.Empty; + + /// + /// 条码类型(数据字典): MaterialLot:批次物料条码； MaterialKeyparts:单件物料条码； Product:产品条码； Carton:箱号条码； Pallet:栈板条码； + /// + public string sn_type { get; set; } = string.Empty; + + /// + /// 前缀 + /// + public string prefix { get; set; } = string.Empty; + + /// + /// 年度 + /// + public int year { get; set; } + + /// + /// 季度 + /// + public int quarter { get; set; } + + /// + /// 月份 + /// + public int month { get; set; } + + /// + /// 周别 + /// + public int week { get; set; } + + /// + /// 日期 + /// + public int date { get; set; } + + /// + /// 流水码长度 + /// + public int serial_lenth { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 系统类型 + /// + public string? system_type { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelStyle.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelStyle.cs index 6aa9c8cd..2042d3a5 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelStyle.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelStyle.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 标签样式（BS打印） +/// +[SugarTable("bas_label_style")] +public partial class BasLabelStyle : BaseEntity { - /// - ///标签样式（BS打印） - /// - [SugarTable("bas_label_style")] - public partial class BasLabelStyle + public BasLabelStyle() { - public BasLabelStyle(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:标签类型代码 - /// Default: - /// Nullable:False - /// - public string label_type_code {get;set;} = string.Empty; - - /// - /// Desc:标签类型名称 - /// Default: - /// Nullable:False - /// - public string label_type_name {get;set;} = string.Empty; - - /// - /// Desc:标签模板内容 - /// Default: - /// Nullable:False - /// - public string label_content {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 标签类型代码 + /// + public string label_type_code { get; set; } = string.Empty; + + /// + /// 标签类型名称 + /// + public string label_type_name { get; set; } = string.Empty; + + /// + /// 标签模板内容 + /// + public string label_content { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplate.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplate.cs index 2fb4c505..f6ed299a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplate.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplate.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 标签模板维护 +/// +[SugarTable("bas_label_template")] +public partial class BasLabelTemplate : BaseEntity { - /// - ///标签模板维护 - /// - [SugarTable("bas_label_template")] - public partial class BasLabelTemplate + public BasLabelTemplate() { - public BasLabelTemplate(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:模板代码 - /// Default: - /// Nullable:False - /// - public string templat_code {get;set;} = string.Empty; - - /// - /// Desc:模板名称 - /// Default: - /// Nullable:False - /// - public string templat_name {get;set;} = string.Empty; - - /// - /// Desc:条码类型(数据字典): MaterialLot:批次物料条码； MaterialKeyparts:单件物料条码； Product:产品条码； Carton:箱号条码； Pallet:栈板条码； - /// Default: - /// Nullable:False - /// - public string sn_type {get;set;} = string.Empty; - - /// - /// Desc:模板路径（可以不选择路径，Copy粘贴亦可） - /// Default: - /// Nullable:False - /// - public string template_path {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 模板代码 + /// + public string templat_code { get; set; } = string.Empty; + + /// + /// 模板名称 + /// + public string templat_name { get; set; } = string.Empty; + + /// + /// 条码类型(数据字典): MaterialLot:批次物料条码； MaterialKeyparts:单件物料条码； Product:产品条码； Carton:箱号条码； Pallet:栈板条码； + /// + public string sn_type { get; set; } = string.Empty; + + /// + /// 模板路径（可以不选择路径，Copy粘贴亦可） + /// + public string template_path { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplateParameter.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplateParameter.cs index b218625b..67746b35 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplateParameter.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLabelTemplateParameter.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 标签模板与参数的关联信息 +/// +[SugarTable("bas_label_template_parameter")] +public partial class BasLabelTemplateParameter : BaseEntity { - /// - ///标签模板与参数的关联信息 - /// - [SugarTable("bas_label_template_parameter")] - public partial class BasLabelTemplateParameter + public BasLabelTemplateParameter() { - public BasLabelTemplateParameter(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:标签模板ID - /// Default: - /// Nullable:False - /// - public string template_id {get;set;} = string.Empty; - - /// - /// Desc:模板代码 - /// Default: - /// Nullable:False - /// - public string templat_code {get;set;} = string.Empty; - - /// - /// Desc:标签参数ID - /// Default: - /// Nullable:False - /// - public string parameter_id {get;set;} = string.Empty; - - /// - /// Desc:参数代码 - /// Default: - /// Nullable:False - /// - public string parameter_code {get;set;} = string.Empty; - - /// - /// Desc:参数顺序 - /// Default: - /// Nullable:False - /// - public int parameter_seq {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 标签模板ID + /// + public string template_id { get; set; } = string.Empty; + + /// + /// 模板代码 + /// + public string templat_code { get; set; } = string.Empty; + + /// + /// 标签参数ID + /// + public string parameter_id { get; set; } = string.Empty; + + /// + /// 参数代码 + /// + public string parameter_code { get; set; } = string.Empty; + + /// + /// 参数顺序 + /// + public int parameter_seq { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs index 1ecd9be1..f7be7566 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 库位资料 +/// +[SugarTable("bas_location")] +public partial class BasLocation : BaseEntity { - /// - ///库位资料 - /// - [SugarTable("bas_location")] - public partial class BasLocation + public BasLocation() { - public BasLocation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:库位代码(库位编号唯一) - /// Default: - /// Nullable:False - /// - public string location_code {get;set;} = string.Empty; - - /// - /// Desc:货架ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? rack_id {get;set;} - - /// - /// Desc:区域ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? region_id {get;set;} - - /// - /// Desc:仓库ID - /// Default: - /// Nullable:False - /// - public string wh_id {get;set;} = string.Empty; - - /// - /// Desc:是否使用 - /// Default: - /// Nullable:False - /// - public string is_use {get;set;} = string.Empty; - - /// - /// Desc:是否最小 - /// Default: - /// Nullable:False - /// - public int is_mix {get;set;} - - /// - /// Desc:层数 - /// Default: - /// Nullable:False - /// - public int layers {get;set;} - - /// - /// Desc:位置序号 - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:是否锁定 - /// Default: - /// Nullable:False - /// - public int is_lock {get;set;} - - /// - /// Desc:库位类型 - /// Default: - /// Nullable:False - /// - public string is_type {get;set;} = string.Empty; - - /// - /// Desc:是否签收 - /// Default: - /// Nullable:False - /// - public int is_sign {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public int? timestamp {get;set;} - - /// - /// Desc:楼层 - /// Default: - /// Nullable:False - /// - public int floor {get;set;} - - /// - /// Desc:库位名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 库位代码(库位编号唯一) + /// + public string location_code { get; set; } = string.Empty; + + /// + /// 货架ID + /// + public string? rack_id { get; set; } + + /// + /// 区域ID + /// + public string? region_id { get; set; } + + /// + /// 仓库ID + /// + public string wh_id { get; set; } = string.Empty; + + /// + /// 是否使用 + /// + public string is_use { get; set; } = string.Empty; + + /// + /// 是否最小 + /// + public int is_mix { get; set; } + + /// + /// 层数 + /// + public int layers { get; set; } + + /// + /// 位置序号 + /// + public int seq { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 是否锁定 + /// + public int is_lock { get; set; } + + /// + /// 库位类型 + /// + public string is_type { get; set; } = string.Empty; + + /// + /// 是否签收 + /// + public int is_sign { get; set; } + + /// + /// 时间戳 + /// + public int? timestamp { get; set; } + + /// + /// 楼层 + /// + public int floor { get; set; } + + /// + /// 库位名称 + /// + public string? location_name { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLocationMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLocationMaterial.cs index c0bf92ee..b3c66637 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasLocationMaterial.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLocationMaterial.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 库位物料资料 +/// +[SugarTable("bas_location_material")] +public partial class BasLocationMaterial : BaseEntity { - /// - ///库位物料资料 - /// - [SugarTable("bas_location_material")] - public partial class BasLocationMaterial + public BasLocationMaterial() { - public BasLocationMaterial(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:库位代码(库位编号唯一) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_code {get;set;} - - /// - /// Desc:物料ID，BAS_MATERIAL.ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物料代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_code {get;set;} - - /// - /// Desc:仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:区域ID - /// Default: - /// Nullable:False - /// - public long regioni_d {get;set;} - - /// - /// Desc:货架ID - /// Default: - /// Nullable:False - /// - public long rack_id {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 库位代码(库位编号唯一) + /// + public string? location_code { get; set; } + + /// + /// 物料ID，BAS_MATERIAL.ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物料代码 + /// + public string? material_code { get; set; } + + /// + /// 仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 区域ID + /// + public long regioni_d { get; set; } + + /// + /// 货架ID + /// + public long rack_id { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs index a169f8b8..633cc417 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs @@ -1,357 +1,252 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料信息 +/// +[SugarTable("bas_material")] +public partial class BasMaterial : BaseEntity { - /// - ///物料信息 - /// - [SugarTable("bas_material")] - public partial class BasMaterial + public BasMaterial() { - public BasMaterial(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string code {get;set;} = string.Empty; - - /// - /// Desc:物料名称 - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:物料分类ID - /// Default: - /// Nullable:False - /// - public string category_id {get;set;} = string.Empty; - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单价 - /// Default: - /// Nullable:True - /// - public decimal? cost {get;set;} - - /// - /// Desc:毛重 - /// Default: - /// Nullable:True - /// - public decimal? grossweight {get;set;} - - /// - /// Desc:净重 - /// Default: - /// Nullable:True - /// - public decimal? netweight {get;set;} - - /// - /// Desc:长 - /// Default: - /// Nullable:True - /// - public decimal? length {get;set;} - - /// - /// Desc:宽 - /// Default: - /// Nullable:True - /// - public decimal? width {get;set;} - - /// - /// Desc:高 - /// Default: - /// Nullable:True - /// - public decimal? high {get;set;} - - /// - /// Desc:体积 - /// Default: - /// Nullable:True - /// - public decimal? volumn {get;set;} - - /// - /// Desc:是否免检 - /// Default: - /// Nullable:True - /// - public int? isexemption {get;set;} - - /// - /// Desc:安全库存 - /// Default: - /// Nullable:True - /// - public decimal? safeqty {get;set;} - - /// - /// Desc:保质期 - /// Default: - /// Nullable:True - /// - public int? qualityperiod {get;set;} - - /// - /// Desc:是否过期允许出库 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? expireout {get;set;} - - /// - /// Desc:最小包装 - /// Default: - /// Nullable:True - /// - public decimal? minpacking {get;set;} - - /// - /// Desc:是否先进先出管控 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fifo {get;set;} - - /// - /// Desc:先进先出间隔天数，批次间隔天数 - /// Default: - /// Nullable:True - /// - public int? fifo_interval_days {get;set;} - - /// - /// Desc:物料规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_standard {get;set;} - - /// - /// Desc:海关编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fhscode {get;set;} - - /// - /// Desc:附属性 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? attribute {get;set;} - - /// - /// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl - /// Default:NULL::character varying - /// Nullable:True - /// - public string? controltype {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? state {get;set;} - - /// - /// Desc:物料属性 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_property {get;set;} - - /// - /// Desc:标签 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? label {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:批次管理 - /// Default: - /// Nullable:True - /// - public int? is_batch_enabled {get;set;} - - /// - /// Desc:标签管理 - /// Default: - /// Nullable:True - /// - public int? is_label_enabled {get;set;} - - /// - /// Desc:附件 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? attachment {get;set;} - - /// - /// Desc:先进先出 0否 1是 - /// Default: - /// Nullable:True - /// - public int? first_in_out {get;set;} - - /// - /// Desc:存储有效期(天) - /// Default: - /// Nullable:True - /// - public int? storage_valid_day {get;set;} - - /// - /// Desc:预警提前期(天) - /// Default: - /// Nullable:True - /// - public int? early_warn_day {get;set;} - - /// - /// Desc:安全库存 - /// Default: - /// Nullable:True - /// - public int? safe_stock {get;set;} - - /// - /// Desc:安全库存包含状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? safe_stock_stauts {get;set;} - - /// - /// Desc:发料仓库id - /// Default: - /// Nullable:True - /// - public string? send_warehouse_id {get;set;} - - /// - /// Desc:入厂单位id - /// Default: - /// Nullable:True - /// - public string? into_factory_unit_id {get;set;} - - /// - /// Desc:投料单位 - /// Default: - /// Nullable:True - /// - public string? material_in_unit_id {get;set;} - - /// - /// Desc:产出单位 - /// Default: - /// Nullable:True - /// - public string? material_out_unit_id {get;set;} - - /// - /// Desc:请料方式 1按计划排程请料 2自行管控 - /// Default: - /// Nullable:True - /// - public string? material_request_method {get;set;} - - /// - /// Desc:是否包含入库数 - /// Default: - /// Nullable:True - /// - public int? is_contain_into_num {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 物料代码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 物料名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 物料分类ID + /// + public string category_id { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单价 + /// + public decimal? cost { get; set; } + + /// + /// 毛重 + /// + public decimal? grossweight { get; set; } + + /// + /// 净重 + /// + public decimal? netweight { get; set; } + + /// + /// 长 + /// + public decimal? length { get; set; } + + /// + /// 宽 + /// + public decimal? width { get; set; } + + /// + /// 高 + /// + public decimal? high { get; set; } + + /// + /// 体积 + /// + public decimal? volumn { get; set; } + + /// + /// 是否免检 + /// + public int? isexemption { get; set; } + + /// + /// 安全库存 + /// + public decimal? safeqty { get; set; } + + /// + /// 保质期 + /// + public int? qualityperiod { get; set; } + + /// + /// 是否过期允许出库 + /// + public string? expireout { get; set; } + + /// + /// 最小包装 + /// + public decimal? minpacking { get; set; } + + /// + /// 是否先进先出管控 + /// + public string? fifo { get; set; } + + /// + /// 先进先出间隔天数，批次间隔天数 + /// + public int? fifo_interval_days { get; set; } + + /// + /// 物料规格型号 + /// + public string? material_standard { get; set; } + + /// + /// 海关编码 + /// + public string? fhscode { get; set; } + + /// + /// 附属性 + /// + public string? attribute { get; set; } + + /// + /// 管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl + /// + public string? controltype { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 状态 + /// + public string? state { get; set; } + + /// + /// 物料属性 + /// + public string? material_property { get; set; } + + /// + /// 标签 + /// + public string? label { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 批次管理 + /// + public int? is_batch_enabled { get; set; } + + /// + /// 标签管理 + /// + public int? is_label_enabled { get; set; } + + /// + /// 附件 + /// + public string? attachment { get; set; } + + /// + /// 先进先出 0否 1是 + /// + public int? first_in_out { get; set; } + + /// + /// 存储有效期(天) + /// + public int? storage_valid_day { get; set; } + + /// + /// 预警提前期(天) + /// + public int? early_warn_day { get; set; } + + /// + /// 安全库存 + /// + public int? safe_stock { get; set; } + + /// + /// 安全库存包含状态 + /// + public string? safe_stock_stauts { get; set; } + + /// + /// 发料仓库id + /// + public string? send_warehouse_id { get; set; } + + /// + /// 入厂单位id + /// + public string? into_factory_unit_id { get; set; } + + /// + /// 投料单位 + /// + public string? material_in_unit_id { get; set; } + + /// + /// 产出单位 + /// + public string? material_out_unit_id { get; set; } + + /// + /// 请料方式 1按计划排程请料 2自行管控 + /// + public string? material_request_method { get; set; } + + /// + /// 是否包含入库数 + /// + public int? is_contain_into_num { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialCategory.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialCategory.cs index e993164d..1c2dfc3a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialCategory.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialCategory.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料类别 +/// +[SugarTable("bas_material_category")] +public partial class BasMaterialCategory : BaseEntity { - /// - ///物料类别 - /// - [SugarTable("bas_material_category")] - public partial class BasMaterialCategory + public BasMaterialCategory() { - public BasMaterialCategory(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:分类代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:分类名称 - /// Default: - /// Nullable:False - /// - public string category_name {get;set;} = string.Empty; - - /// - /// Desc:父物料列表ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:是否生效 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? isactive {get;set;} - - /// - /// Desc:工艺路线 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 分类代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 分类名称 + /// + public string category_name { get; set; } = string.Empty; + + /// + /// 父物料列表ID + /// + public string? parent_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 是否生效 + /// + public string? isactive { get; set; } + + /// + /// 工艺路线 + /// + public string? route_name { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs index 44183739..952e4a49 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs @@ -1,49 +1,32 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料入场规格 +/// +[SugarTable("bas_material_into_factory_specifications")] +public partial class BasMaterialIntoFactorySpecifications : BaseEntity { - /// - ///物料入场规格 - /// - [SugarTable("bas_material_into_factory_specifications")] - public partial class BasMaterialIntoFactorySpecifications + public BasMaterialIntoFactorySpecifications() { - public BasMaterialIntoFactorySpecifications(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:物料id - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:单位id - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public decimal num {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 物料id + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 单位id + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 数量 + /// + public decimal num { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialStorage.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialStorage.cs index c488c453..866c4522 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialStorage.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialStorage.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料库存信息 +/// +[SugarTable("bas_material_storage")] +public partial class BasMaterialStorage : BaseEntity { - /// - ///物料库存信息 - /// - [SugarTable("bas_material_storage")] - public partial class BasMaterialStorage + public BasMaterialStorage() { - public BasMaterialStorage(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:先进先出 0否 1是 - /// Default: - /// Nullable:False - /// - public int first_in_out {get;set;} - - /// - /// Desc:存储有效期(天) - /// Default: - /// Nullable:True - /// - public int? storage_valid_day {get;set;} - - /// - /// Desc:预警提前期(天) - /// Default: - /// Nullable:True - /// - public int? early_warn_day {get;set;} - - /// - /// Desc:安全库存 - /// Default: - /// Nullable:True - /// - public int? safe_stock {get;set;} - - /// - /// Desc:安全库存包含状态 - /// Default: - /// Nullable:True - /// - public int? safe_stock_stauts {get;set;} - - /// - /// Desc:发料仓库id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? warehouse_id {get;set;} - - /// - /// Desc:入厂单位id - /// Default: - /// Nullable:False - /// - public string into_factory_unit_id {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 先进先出 0否 1是 + /// + public int first_in_out { get; set; } + + /// + /// 存储有效期(天) + /// + public int? storage_valid_day { get; set; } + + /// + /// 预警提前期(天) + /// + public int? early_warn_day { get; set; } + + /// + /// 安全库存 + /// + public int? safe_stock { get; set; } + + /// + /// 安全库存包含状态 + /// + public int? safe_stock_stauts { get; set; } + + /// + /// 发料仓库id + /// + public string? warehouse_id { get; set; } + + /// + /// 入厂单位id + /// + public string into_factory_unit_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialUnit.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialUnit.cs index 33be90a8..cca5f45c 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialUnit.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterialUnit.cs @@ -1,56 +1,37 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 物料转换单位 +/// +[SugarTable("bas_material_unit")] +public partial class BasMaterialUnit : BaseEntity { - /// - ///物料转换单位 - /// - [SugarTable("bas_material_unit")] - public partial class BasMaterialUnit + public BasMaterialUnit() { - public BasMaterialUnit(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:主单位数量 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? number_of_primary_unit {get;set;} - - /// - /// Desc:辅助单位数量 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? number_of_auxiliary_unit {get;set;} - - /// - /// Desc:辅助单位 - /// Default: - /// Nullable:False - /// - public string auxiliary_unit_id {get;set;} = string.Empty; - - /// - /// Desc:关联物料id - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 主单位数量 + /// + public string? number_of_primary_unit { get; set; } + + /// + /// 辅助单位数量 + /// + public string? number_of_auxiliary_unit { get; set; } + + /// + /// 辅助单位 + /// + public string auxiliary_unit_id { get; set; } = string.Empty; + + /// + /// 关联物料id + /// + public string material_id { get; set; } = string.Empty; + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs index f28099a8..3a8f634e 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产bom +/// +[SugarTable("bas_mbom")] +public partial class BasMbom : BaseEntity { - /// - ///生产bom - /// - [SugarTable("bas_mbom")] - public partial class BasMbom + public BasMbom() { - public BasMbom(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:物料id - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public int num {get;set;} - - /// - /// Desc:单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_id {get;set;} - - /// - /// Desc:有效结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:版本号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? version {get;set;} - - /// - /// Desc:物料清单id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? ebom_id {get;set;} - - /// - /// Desc:有效开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:工艺路线id - /// Default: - /// Nullable:False - /// - public string route_id {get;set;} = string.Empty; - - /// - /// Desc:物料均在首道工序投产 - /// Default: - /// Nullable:True - /// - public int? is_first {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:仅用于关联表字段查询用不存储数据 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? query_info {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 物料id + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 数量 + /// + public int num { get; set; } + + /// + /// 单位 + /// + public string? unit_id { get; set; } + + /// + /// 有效结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 版本号 + /// + public string? version { get; set; } + + /// + /// 物料清单id + /// + public string? ebom_id { get; set; } + + /// + /// 有效开始时间 + /// + public DateTime? start_time { get; set; } + + /// + /// 工艺路线id + /// + public string route_id { get; set; } = string.Empty; + + /// + /// 物料均在首道工序投产 + /// + public int? is_first { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 仅用于关联表字段查询用不存储数据 + /// + public string? query_info { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs index 5548be66..59d51e10 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs @@ -1,70 +1,47 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产bom子表投入物料 +/// +[SugarTable("bas_mbom_input")] +public partial class BasMbomInput : BaseEntity { - /// - ///生产bom子表投入物料 - /// - [SugarTable("bas_mbom_input")] - public partial class BasMbomInput + public BasMbomInput() { - public BasMbomInput(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:生产bomid - /// Default: - /// Nullable:False - /// - public string mbom_id {get;set;} = string.Empty; - - /// - /// Desc:生产bom子表id - /// Default: - /// Nullable:False - /// - public string mbom_process_id {get;set;} = string.Empty; - - /// - /// Desc:工序id - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:物料id - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public decimal num {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 生产bomid + /// + public string mbom_id { get; set; } = string.Empty; + + /// + /// 生产bom子表id + /// + public string mbom_process_id { get; set; } = string.Empty; + + /// + /// 工序id + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 物料id + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 数量 + /// + public decimal num { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs index e7a9369b..745edbe4 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs @@ -1,70 +1,47 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产bom子表产出物料 +/// +[SugarTable("bas_mbom_output")] +public partial class BasMbomOutput : BaseEntity { - /// - ///生产bom子表产出物料 - /// - [SugarTable("bas_mbom_output")] - public partial class BasMbomOutput + public BasMbomOutput() { - public BasMbomOutput(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:生产bomid - /// Default: - /// Nullable:False - /// - public string mbom_id {get;set;} = string.Empty; - - /// - /// Desc:工序id - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:物料id - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:生产bom子表id - /// Default: - /// Nullable:False - /// - public string mbom_process_id {get;set;} = string.Empty; - - /// - /// Desc:产出数量(可小数分数) - /// Default: - /// Nullable:False - /// - public string num {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 生产bomid + /// + public string mbom_id { get; set; } = string.Empty; + + /// + /// 工序id + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 物料id + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 生产bom子表id + /// + public string mbom_process_id { get; set; } = string.Empty; + + /// + /// 产出数量(可小数分数) + /// + public string num { get; set; } = string.Empty; + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutputExt.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutputExt.cs index de257475..86349644 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutputExt.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutputExt.cs @@ -1,63 +1,42 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产bom子表物料信息 +/// +[SugarTable("bas_mbom_output_ext")] +public partial class BasMbomOutputExt : BaseEntity { - /// - ///生产bom子表物料信息 - /// - [SugarTable("bas_mbom_output_ext")] - public partial class BasMbomOutputExt + public BasMbomOutputExt() { - public BasMbomOutputExt(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工序id - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:生产bomid - /// Default: - /// Nullable:False - /// - public string mbom_id {get;set;} = string.Empty; - - /// - /// Desc:生产bom子表id - /// Default: - /// Nullable:False - /// - public string mbom_process_id {get;set;} = string.Empty; - - /// - /// Desc:副产出管控 0 不启用 1 启用 - /// Default: - /// Nullable:False - /// - public string byproduct_status {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工序id + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 生产bomid + /// + public string mbom_id { get; set; } = string.Empty; + + /// + /// 生产bom子表id + /// + public string mbom_process_id { get; set; } = string.Empty; + + /// + /// 副产出管控 0 不启用 1 启用 + /// + public string byproduct_status { get; set; } = string.Empty; + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs index 2c87382f..a91ff507 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs @@ -1,77 +1,52 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产bom子表 +/// +[SugarTable("bas_mbom_process")] +public partial class BasMbomProcess : BaseEntity { - /// - ///生产bom子表 - /// - [SugarTable("bas_mbom_process")] - public partial class BasMbomProcess + public BasMbomProcess() { - public BasMbomProcess(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:生产bomid - /// Default: - /// Nullable:False - /// - public string mbom_id {get;set;} = string.Empty; - - /// - /// Desc:工序id - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:工位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? station {get;set;} - - /// - /// Desc:准备时间 - /// Default: - /// Nullable:False - /// - public decimal preparation_time {get;set;} - - /// - /// Desc:副产出管控 - /// Default: - /// Nullable:False - /// - public int byproduct_status {get;set;} - - /// - /// Desc:投产方式 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? production_method {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 生产bomid + /// + public string mbom_id { get; set; } = string.Empty; + + /// + /// 工序id + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 工位 + /// + public string? station { get; set; } + + /// + /// 准备时间 + /// + public decimal preparation_time { get; set; } + + /// + /// 副产出管控 + /// + public int byproduct_status { get; set; } + + /// + /// 投产方式 + /// + public string? production_method { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecifications.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecifications.cs index d7ff1a70..c4983558 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecifications.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecifications.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 嵌套规格 +/// +[SugarTable("bas_packaging_specifications")] +public partial class BasPackagingSpecifications : BaseEntity { - /// - ///嵌套规格 - /// - [SugarTable("bas_packaging_specifications")] - public partial class BasPackagingSpecifications + public BasPackagingSpecifications() { - public BasPackagingSpecifications(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? packaging_code {get;set;} - - /// - /// Desc:名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? packaging_name {get;set;} - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:物料列表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_list {get;set;} - - /// - /// Desc:标签模板 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? label_templates {get;set;} - - /// - /// Desc:标签规则 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? label_rules {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:扩展字段2 - /// Default: - /// Nullable:True - /// - public string? extras2 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 编号 + /// + public string? packaging_code { get; set; } + + /// + /// 名称 + /// + public string? packaging_name { get; set; } + + /// + /// 状态 + /// + public string? status { get; set; } + + /// + /// 物料列表 + /// + public string? material_list { get; set; } + + /// + /// 标签模板 + /// + public string? label_templates { get; set; } + + /// + /// 标签规则 + /// + public string? label_rules { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 扩展字段2 + /// + public string? extras2 { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsItems.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsItems.cs index f7c22f89..a1aeceaa 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsItems.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsItems.cs @@ -1,63 +1,42 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 嵌套规格子表物料规格 +/// +[SugarTable("bas_packaging_specifications_items")] +public partial class BasPackagingSpecificationsItems : BaseEntity { - /// - ///嵌套规格子表物料规格 - /// - [SugarTable("bas_packaging_specifications_items")] - public partial class BasPackagingSpecificationsItems + public BasPackagingSpecificationsItems() { - public BasPackagingSpecificationsItems(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:嵌套规格 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? packaging_specifications_id {get;set;} - - /// - /// Desc:物料名称/编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:规格描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? specifications_descrip {get;set;} - - /// - /// Desc:嵌套数量 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? packaging_nums {get;set;} - - /// - /// Desc:单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 嵌套规格 + /// + public string? packaging_specifications_id { get; set; } + + /// + /// 物料名称/编码 + /// + public string? material_id { get; set; } + + /// + /// 规格描述 + /// + public string? specifications_descrip { get; set; } + + /// + /// 嵌套数量 + /// + public string? packaging_nums { get; set; } + + /// + /// 单位 + /// + public string? unit { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsLabel.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsLabel.cs index 18434ca0..5eb47f29 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsLabel.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasPackagingSpecificationsLabel.cs @@ -1,49 +1,32 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 嵌套规格子表标签模板 +/// +[SugarTable("bas_packaging_specifications_label")] +public partial class BasPackagingSpecificationsLabel : BaseEntity { - /// - ///嵌套规格子表标签模板 - /// - [SugarTable("bas_packaging_specifications_label")] - public partial class BasPackagingSpecificationsLabel + public BasPackagingSpecificationsLabel() { - public BasPackagingSpecificationsLabel(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:嵌套规格 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? packaging_specifications_id {get;set;} - - /// - /// Desc:标签模板 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? label_templates {get;set;} - - /// - /// Desc:是否默认 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? is_default {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 嵌套规格 + /// + public string? packaging_specifications_id { get; set; } + + /// + /// 标签模板 + /// + public string? label_templates { get; set; } + + /// + /// 是否默认 + /// + public string? is_default { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasParameter.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasParameter.cs index 8f5ec382..da8ac0d8 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasParameter.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasParameter.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 参数配置表 +/// +[SugarTable("bas_parameter")] +public partial class BasParameter : BaseEntity { - /// - ///参数配置表 - /// - [SugarTable("bas_parameter")] - public partial class BasParameter + public BasParameter() { - public BasParameter(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:系统：WMS、MES - /// Default: - /// Nullable:False - /// - public string system_type {get;set;} = string.Empty; - - /// - /// Desc:是否为静态变量，静态不显示 - /// Default: - /// Nullable:False - /// - public int is_static {get;set;} - - /// - /// Desc:参数类型 - /// Default: - /// Nullable:False - /// - public string parameter_type {get;set;} = string.Empty; - - /// - /// Desc:科目（模块） - /// Default: - /// Nullable:False - /// - public string section {get;set;} = string.Empty; - - /// - /// Desc:参数键 - /// Default: - /// Nullable:False - /// - public string key {get;set;} = string.Empty; - - /// - /// Desc:参数值 - /// Default: - /// Nullable:False - /// - public string value {get;set;} = string.Empty; - - /// - /// Desc:默认参数值（参考值，不能修改） - /// Default:NULL::character varying - /// Nullable:True - /// - public string? defaultvalue {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 系统：WMS、MES + /// + public string system_type { get; set; } = string.Empty; + + /// + /// 是否为静态变量，静态不显示 + /// + public int is_static { get; set; } + + /// + /// 参数类型 + /// + public string parameter_type { get; set; } = string.Empty; + + /// + /// 科目（模块） + /// + public string section { get; set; } = string.Empty; + + /// + /// 参数键 + /// + public string key { get; set; } = string.Empty; + + /// + /// 参数值 + /// + public string value { get; set; } = string.Empty; + + /// + /// 默认参数值（参考值，不能修改） + /// + public string? defaultvalue { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasPbomD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasPbomD.cs index 6ccf0592..540d0525 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasPbomD.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasPbomD.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序BOM明细 +/// +[SugarTable("bas_pbom_d")] +public partial class BasPbomD : BaseEntity { - /// - ///工序BOM明细 - /// - [SugarTable("bas_pbom_d")] - public partial class BasPbomD + public BasPbomD() { - public BasPbomD(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:标准BOM主档ID，BAS_PROCESS_BOM_H.ID - /// Default: - /// Nullable:False - /// - public string pbom_id {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:物料顺序号 - /// Default: - /// Nullable:False - /// - public int sub_seq {get;set;} - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string subm_code {get;set;} = string.Empty; - - /// - /// Desc:物料单位 - /// Default: - /// Nullable:False - /// - public string sub_unit {get;set;} = string.Empty; - - /// - /// Desc:单件用量 - /// Default: - /// Nullable:False - /// - public decimal sub_qty {get;set;} - - /// - /// Desc:位号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? sub_location {get;set;} - - /// - /// Desc:物料用途： 1：消耗的物料（主料） 2：消耗用辅料（辅料） - /// Default: - /// Nullable:False - /// - public int usetype {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 标准BOM主档ID，BAS_PROCESS_BOM_H.ID + /// + public string pbom_id { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 物料顺序号 + /// + public int sub_seq { get; set; } + + /// + /// 物料代码 + /// + public string subm_code { get; set; } = string.Empty; + + /// + /// 物料单位 + /// + public string sub_unit { get; set; } = string.Empty; + + /// + /// 单件用量 + /// + public decimal sub_qty { get; set; } + + /// + /// 位号 + /// + public string? sub_location { get; set; } + + /// + /// 物料用途： 1：消耗的物料（主料） 2：消耗用辅料（辅料） + /// + public int usetype { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasPbomH.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasPbomH.cs index ea01b7a6..948be9d0 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasPbomH.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasPbomH.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序BOM主档 +/// +[SugarTable("bas_pbom_h")] +public partial class BasPbomH : BaseEntity { - /// - ///工序BOM主档 - /// - [SugarTable("bas_pbom_h")] - public partial class BasPbomH + public BasPbomH() { - public BasPbomH(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品ID，BAS_ITEM.ID - /// Default: - /// Nullable:False - /// - public string item_id {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:BOM类型： 生产BOM：Standard 返工BOM：Rework 试制BOM：Trial 返修BOM：RMA 包装BOM：Pack - /// Default: - /// Nullable:False - /// - public string bom_type {get;set;} = string.Empty; - - /// - /// Desc:工序BOM版本 - /// Default: - /// Nullable:False - /// - public string version {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品ID，BAS_ITEM.ID + /// + public string item_id { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// BOM类型： 生产BOM：Standard 返工BOM：Rework 试制BOM：Trial 返修BOM：RMA 包装BOM：Pack + /// + public string bom_type { get; set; } = string.Empty; + + /// + /// 工序BOM版本 + /// + public string version { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProcess.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcess.cs index 2670f0c1..1831256c 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProcess.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProcess.cs @@ -1,224 +1,157 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序资料 +/// +[SugarTable("bas_process")] +public partial class BasProcess : BaseEntity { - /// - ///工序资料 - /// - [SugarTable("bas_process")] - public partial class BasProcess + public BasProcess() { - public BasProcess(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:工序名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_name {get;set;} - - /// - /// Desc:数据收集方式 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_collection {get;set;} - - /// - /// Desc:工序类型 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_type {get;set;} - - /// - /// Desc:工序属性 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_attribute {get;set;} - - /// - /// Desc:必过工序 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? must_pass {get;set;} - - /// - /// Desc:处理时间 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_time {get;set;} - - /// - /// Desc:时间单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_unit {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:单次扫码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? single_scan_type {get;set;} - - /// - /// Desc:工位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? station {get;set;} - - /// - /// Desc:一码到底 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? only_scan_type {get;set;} - - /// - /// Desc:次品项列表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? defective_items {get;set;} - - /// - /// Desc:用料追溯关系 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_traced_back_relationship {get;set;} - - /// - /// Desc:不合格品投产 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? defective_products_put_into_production {get;set;} - - /// - /// Desc:报告模板 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? report_template {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:附件 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? attachment {get;set;} - - /// - /// Desc:扩展字段2 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extras2 {get;set;} - - /// - /// Desc:扩展字段3 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extras3 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 工序名称 + /// + public string? process_name { get; set; } + + /// + /// 数据收集方式 + /// + public string? process_collection { get; set; } + + /// + /// 工序类型 + /// + public string? process_type { get; set; } + + /// + /// 工序属性 + /// + public string? process_attribute { get; set; } + + /// + /// 必过工序 + /// + public string? must_pass { get; set; } + + /// + /// 处理时间 + /// + public string? process_time { get; set; } + + /// + /// 时间单位 + /// + public string? time_unit { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 状态 + /// + public string? status { get; set; } + + /// + /// 单次扫码 + /// + public string? single_scan_type { get; set; } + + /// + /// 工位 + /// + public string? station { get; set; } + + /// + /// 一码到底 + /// + public string? only_scan_type { get; set; } + + /// + /// 次品项列表 + /// + public string? defective_items { get; set; } + + /// + /// 用料追溯关系 + /// + public string? material_traced_back_relationship { get; set; } + + /// + /// 不合格品投产 + /// + public string? defective_products_put_into_production { get; set; } + + /// + /// 报告模板 + /// + public string? report_template { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 附件 + /// + public string? attachment { get; set; } + + /// + /// 扩展字段2 + /// + public string? extras2 { get; set; } + + /// + /// 扩展字段3 + /// + public string? extras3 { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessDefective.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessDefective.cs index 3e35008d..31c45e02 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessDefective.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessDefective.cs @@ -1,49 +1,32 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序次品关联表 +/// +[SugarTable("bas_process_defective")] +public partial class BasProcessDefective : BaseEntity { - /// - ///工序次品关联表 - /// - [SugarTable("bas_process_defective")] - public partial class BasProcessDefective + public BasProcessDefective() { - public BasProcessDefective(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工序id - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:次品id - /// Default: - /// Nullable:False - /// - public string defective_id {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工序id + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 次品id + /// + public string defective_id { get; set; } = string.Empty; + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsop.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsop.cs index f0a11ffd..0242282b 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsop.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsop.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序ESOP文件主档表 +/// +[SugarTable("bas_process_esop")] +public partial class BasProcessEsop : BaseEntity { - /// - ///工序ESOP文件主档表 - /// - [SugarTable("bas_process_esop")] - public partial class BasProcessEsop + public BasProcessEsop() { - public BasProcessEsop(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:文件名 - /// Default: - /// Nullable:False - /// - public string file_name {get;set;} = string.Empty; - - /// - /// Desc:文件类型代码 - /// Default: - /// Nullable:False - /// - public string filetype_code {get;set;} = string.Empty; - - /// - /// Desc:文件类型名称 - /// Default: - /// Nullable:False - /// - public string filetype_name {get;set;} = string.Empty; - - /// - /// Desc:产品ID - /// Default: - /// Nullable:False - /// - public string item_id {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:同步控制 10-同步并覆盖 20-同步不覆盖 30-不允许同步 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? sync_control {get;set;} - - /// - /// Desc:产品ESOP文件主档id - /// Default: - /// Nullable:True - /// - public long? item_esopid {get;set;} - - /// - /// Desc:是否生效 - /// Default: - /// Nullable:False - /// - public int isactive {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 文件名 + /// + public string file_name { get; set; } = string.Empty; + + /// + /// 文件类型代码 + /// + public string filetype_code { get; set; } = string.Empty; + + /// + /// 文件类型名称 + /// + public string filetype_name { get; set; } = string.Empty; + + /// + /// 产品ID + /// + public string item_id { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 同步控制 10-同步并覆盖 20-同步不覆盖 30-不允许同步 + /// + public string? sync_control { get; set; } + + /// + /// 产品ESOP文件主档id + /// + public long? item_esopid { get; set; } + + /// + /// 是否生效 + /// + public int isactive { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsopFile.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsopFile.cs index 5a2a2770..a237294f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsopFile.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessEsopFile.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序ESOP文件明细 +/// +[SugarTable("bas_process_esop_file")] +public partial class BasProcessEsopFile : BaseEntity { - /// - ///工序ESOP文件明细 - /// - [SugarTable("bas_process_esop_file")] - public partial class BasProcessEsopFile + public BasProcessEsopFile() { - public BasProcessEsopFile(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工序文件主档id - /// Default: - /// Nullable:False - /// - public string process_esopid {get;set;} = string.Empty; - - /// - /// Desc:文件名 - /// Default: - /// Nullable:False - /// - public string filen_ame {get;set;} = string.Empty; - - /// - /// Desc:文件类型: JPG,PDF - /// Default: - /// Nullable:False - /// - public string file_type {get;set;} = string.Empty; - - /// - /// Desc:文件路径 - /// Default: - /// Nullable:False - /// - public string file_path {get;set;} = string.Empty; - - /// - /// Desc:版本 - /// Default: - /// Nullable:False - /// - public string version {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public short isactive {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工序文件主档id + /// + public string process_esopid { get; set; } = string.Empty; + + /// + /// 文件名 + /// + public string filen_ame { get; set; } = string.Empty; + + /// + /// 文件类型: JPG,PDF + /// + public string file_type { get; set; } = string.Empty; + + /// + /// 文件路径 + /// + public string file_path { get; set; } = string.Empty; + + /// + /// 版本 + /// + public string version { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 是否启用 + /// + public short isactive { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessStation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessStation.cs index 76e6f626..9cba2dd0 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProcessStation.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProcessStation.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工序与工位的关联信息 +/// +[SugarTable("bas_process_station")] +public partial class BasProcessStation : BaseEntity { - /// - ///工序与工位的关联信息 - /// - [SugarTable("bas_process_station")] - public partial class BasProcessStation + public BasProcessStation() { - public BasProcessStation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工序ID，BAS_PROCESS.ID - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:工位ID，BAS_STATION.ID - /// Default: - /// Nullable:False - /// - public string station_id {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? station_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工序ID，BAS_PROCESS.ID + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 工位ID，BAS_STATION.ID + /// + public string station_id { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string? station_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProduct.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProduct.cs index e7aff583..a84e3ca8 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProduct.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProduct.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品信息 +/// +[SugarTable("bas_product")] +public partial class BasProduct : BaseEntity { - /// - ///产品信息 - /// - [SugarTable("bas_product")] - public partial class BasProduct + public BasProduct() { - public BasProduct(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string product_code {get;set;} = string.Empty; - - /// - /// Desc:产品名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_name {get;set;} - - /// - /// Desc:产品规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_standard {get;set;} - - /// - /// Desc:产品分类ID - /// Default: - /// Nullable:False - /// - public string categoryid {get;set;} = string.Empty; - - /// - /// Desc:物料ID，BAS_MATERIAL.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:产品类型： 半成品：SemiManufacture 成品：FinishedProduct - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type {get;set;} - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:True - /// - public decimal? relation_ratio {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品代码 + /// + public string product_code { get; set; } = string.Empty; + + /// + /// 产品名称 + /// + public string? product_name { get; set; } + + /// + /// 产品规格型号 + /// + public string? product_standard { get; set; } + + /// + /// 产品分类ID + /// + public string categoryid { get; set; } = string.Empty; + + /// + /// 物料ID，BAS_MATERIAL.ID + /// + public string? material_id { get; set; } + + /// + /// 产品类型： 半成品：SemiManufacture 成品：FinishedProduct + /// + public string? product_type { get; set; } + + /// + /// 关联比例 + /// + public decimal? relation_ratio { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductCategory.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductCategory.cs index ffd86099..cf0a41c2 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductCategory.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductCategory.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品类别 +/// +[SugarTable("bas_product_category")] +public partial class BasProductCategory : BaseEntity { - /// - ///产品类别 - /// - [SugarTable("bas_product_category")] - public partial class BasProductCategory + public BasProductCategory() { - public BasProductCategory(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:父产品列表ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:分类代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:分类名称 - /// Default: - /// Nullable:False - /// - public string category_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:不良代码组 - /// Default: - /// Nullable:True - /// - public string? errorcode {get;set;} - - /// - /// Desc:不良原因组 - /// Default: - /// Nullable:True - /// - public string? errorcause {get;set;} - - /// - /// Desc:解决方案组 - /// Default: - /// Nullable:True - /// - public string? errorsolution {get;set;} - - /// - /// Desc:包含组件组 - /// Default: - /// Nullable:True - /// - public string? component {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 父产品列表ID + /// + public string? parent_id { get; set; } + + /// + /// 分类代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 分类名称 + /// + public string category_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 不良代码组 + /// + public string? errorcode { get; set; } + + /// + /// 不良原因组 + /// + public string? errorcause { get; set; } + + /// + /// 解决方案组 + /// + public string? errorsolution { get; set; } + + /// + /// 包含组件组 + /// + public string? component { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductDoc.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductDoc.cs index ede8e07e..876e9328 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductDoc.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductDoc.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品工序关联文档 +/// +[SugarTable("bas_product_doc")] +public partial class BasProductDoc : BaseEntity { - /// - ///产品工序关联文档 - /// - [SugarTable("bas_product_doc")] - public partial class BasProductDoc + public BasProductDoc() { - public BasProductDoc(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string product_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_code {get;set;} - - /// - /// Desc:工艺路线版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_verison {get;set;} - - /// - /// Desc:工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:文档编号 - /// Default: - /// Nullable:False - /// - public string doc_code {get;set;} = string.Empty; - - /// - /// Desc:文档版本 - /// Default: - /// Nullable:False - /// - public decimal doc_version {get;set;} - - /// - /// Desc:文档唯一码 GUID 的文本 - /// Default: - /// Nullable:False - /// - public string doc_unique_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品代码 + /// + public string product_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string? route_code { get; set; } + + /// + /// 工艺路线版本 + /// + public string? route_verison { get; set; } + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 文档编号 + /// + public string doc_code { get; set; } = string.Empty; + + /// + /// 文档版本 + /// + public decimal doc_version { get; set; } + + /// + /// 文档唯一码 GUID 的文本 + /// + public string doc_unique_code { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductDocLog.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductDocLog.cs index 7eba6edd..22e6ef5e 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductDocLog.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductDocLog.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品关联文档记录 +/// +[SugarTable("bas_product_doc_log")] +public partial class BasProductDocLog : BaseEntity { - /// - ///产品关联文档记录 - /// - [SugarTable("bas_product_doc_log")] - public partial class BasProductDocLog + public BasProductDocLog() { - public BasProductDocLog(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string product_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_code {get;set;} - - /// - /// Desc:工艺路线版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_verison {get;set;} - - /// - /// Desc:工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:文档编号 - /// Default: - /// Nullable:False - /// - public string doc_code {get;set;} = string.Empty; - - /// - /// Desc:文档版本 - /// Default: - /// Nullable:False - /// - public decimal doc_version {get;set;} - - /// - /// Desc:文档唯一码 GUID 的文本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? doc_unique_code {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品代码 + /// + public string product_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string? route_code { get; set; } + + /// + /// 工艺路线版本 + /// + public string? route_verison { get; set; } + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 文档编号 + /// + public string doc_code { get; set; } = string.Empty; + + /// + /// 文档版本 + /// + public decimal doc_version { get; set; } + + /// + /// 文档唯一码 GUID 的文本 + /// + public string? doc_unique_code { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsop.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsop.cs index 081917ce..508b0a16 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsop.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsop.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品ESOP文件主档表 +/// +[SugarTable("bas_product_esop")] +public partial class BasProductEsop : BaseEntity { - /// - ///产品ESOP文件主档表 - /// - [SugarTable("bas_product_esop")] - public partial class BasProductEsop + public BasProductEsop() { - public BasProductEsop(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:文件名 - /// Default: - /// Nullable:False - /// - public string file_name {get;set;} = string.Empty; - - /// - /// Desc:文件类型代码 - /// Default: - /// Nullable:False - /// - public string filetype_code {get;set;} = string.Empty; - - /// - /// Desc:文件类型名称 - /// Default: - /// Nullable:False - /// - public string filetype_name {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string product_id {get;set;} = string.Empty; - - /// - /// Desc:产品名称 - /// Default: - /// Nullable:False - /// - public string product_code {get;set;} = string.Empty; - - /// - /// Desc:是否生效 - /// Default: - /// Nullable:False - /// - public int is_active {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 文件名 + /// + public string file_name { get; set; } = string.Empty; + + /// + /// 文件类型代码 + /// + public string filetype_code { get; set; } = string.Empty; + + /// + /// 文件类型名称 + /// + public string filetype_name { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string product_id { get; set; } = string.Empty; + + /// + /// 产品名称 + /// + public string product_code { get; set; } = string.Empty; + + /// + /// 是否生效 + /// + public int is_active { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsopFile.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsopFile.cs index caac8fae..bb6dfd21 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsopFile.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductEsopFile.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品ESOP文件明细 +/// +[SugarTable("bas_product_esop_file")] +public partial class BasProductEsopFile : BaseEntity { - /// - ///产品ESOP文件明细 - /// - [SugarTable("bas_product_esop_file")] - public partial class BasProductEsopFile + public BasProductEsopFile() { - public BasProductEsopFile(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品ESOP文件主档id - /// Default: - /// Nullable:False - /// - public string product_esop_id {get;set;} = string.Empty; - - /// - /// Desc:文件类型: JPG,PDF - /// Default: - /// Nullable:False - /// - public string file_type {get;set;} = string.Empty; - - /// - /// Desc:文件名 - /// Default: - /// Nullable:False - /// - public string file_name {get;set;} = string.Empty; - - /// - /// Desc:文件路径 - /// Default: - /// Nullable:False - /// - public string file_path {get;set;} = string.Empty; - - /// - /// Desc:版本 - /// Default: - /// Nullable:False - /// - public string version {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int is_active {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品ESOP文件主档id + /// + public string product_esop_id { get; set; } = string.Empty; + + /// + /// 文件类型: JPG,PDF + /// + public string file_type { get; set; } = string.Empty; + + /// + /// 文件名 + /// + public string file_name { get; set; } = string.Empty; + + /// + /// 文件路径 + /// + public string file_path { get; set; } = string.Empty; + + /// + /// 版本 + /// + public string version { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 是否启用 + /// + public int is_active { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeComponent.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeComponent.cs index 5028a9f9..82527e2a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeComponent.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeComponent.cs @@ -1,91 +1,62 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品类别包含组件（用于维修） +/// +[SugarTable("bas_product_type_component")] +public partial class BasProductTypeComponent : BaseEntity { - /// - ///产品类别包含组件（用于维修） - /// - [SugarTable("bas_product_type_component")] - public partial class BasProductTypeComponent + public BasProductTypeComponent() { - public BasProductTypeComponent(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品类别ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_id {get;set;} - - /// - /// Desc:产品类别代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_code {get;set;} - - /// - /// Desc:组件名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? component_name {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品类别ID + /// + public string? product_type_id { get; set; } + + /// + /// 产品类别代码 + /// + public string? product_type_code { get; set; } + + /// + /// 组件名称 + /// + public string? component_name { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcause.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcause.cs index 95d65ff8..a7e66420 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcause.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcause.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品类别与不良原因组关系 +/// +[SugarTable("bas_product_type_errorcause")] +public partial class BasProductTypeErrorcause : BaseEntity { - /// - ///产品类别与不良原因组关系 - /// - [SugarTable("bas_product_type_errorcause")] - public partial class BasProductTypeErrorcause + public BasProductTypeErrorcause() { - public BasProductTypeErrorcause(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品类别ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_id {get;set;} - - /// - /// Desc:产品类别代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_code {get;set;} - - /// - /// Desc:不良原因组ID - /// Default: - /// Nullable:False - /// - public string errorcause_groupid {get;set;} = string.Empty; - - /// - /// Desc:不良原因组代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? errorcode_groupcode {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品类别ID + /// + public string? product_type_id { get; set; } + + /// + /// 产品类别代码 + /// + public string? product_type_code { get; set; } + + /// + /// 不良原因组ID + /// + public string errorcause_groupid { get; set; } = string.Empty; + + /// + /// 不良原因组代码 + /// + public string? errorcode_groupcode { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcode.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcode.cs index 8a435025..c3d006d2 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcode.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorcode.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品类别与不良代码组关系 +/// +[SugarTable("bas_product_type_errorcode")] +public partial class BasProductTypeErrorcode : BaseEntity { - /// - ///产品类别与不良代码组关系 - /// - [SugarTable("bas_product_type_errorcode")] - public partial class BasProductTypeErrorcode + public BasProductTypeErrorcode() { - public BasProductTypeErrorcode(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品类别ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_id {get;set;} - - /// - /// Desc:产品类别代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_code {get;set;} - - /// - /// Desc:不良代码组ID - /// Default: - /// Nullable:False - /// - public string errorcode_groupid {get;set;} = string.Empty; - - /// - /// Desc:不良代码组 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? errorcode_groupcode {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品类别ID + /// + public string? product_type_id { get; set; } + + /// + /// 产品类别代码 + /// + public string? product_type_code { get; set; } + + /// + /// 不良代码组ID + /// + public string errorcode_groupid { get; set; } = string.Empty; + + /// + /// 不良代码组 + /// + public string? errorcode_groupcode { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorsolution.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorsolution.cs index ec8d2ac0..2b88548f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorsolution.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductTypeErrorsolution.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品类别与解决方案关系 +/// +[SugarTable("bas_product_type_errorsolution")] +public partial class BasProductTypeErrorsolution : BaseEntity { - /// - ///产品类别与解决方案关系 - /// - [SugarTable("bas_product_type_errorsolution")] - public partial class BasProductTypeErrorsolution + public BasProductTypeErrorsolution() { - public BasProductTypeErrorsolution(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品类别ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_id {get;set;} - - /// - /// Desc:产品类别代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_type_code {get;set;} - - /// - /// Desc:不良解决方案ID - /// Default: - /// Nullable:False - /// - public string solution_id {get;set;} = string.Empty; - - /// - /// Desc:不良解决方案代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? solution_code {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品类别ID + /// + public string? product_type_id { get; set; } + + /// + /// 产品类别代码 + /// + public string? product_type_code { get; set; } + + /// + /// 不良解决方案ID + /// + public string solution_id { get; set; } = string.Empty; + + /// + /// 不良解决方案代码 + /// + public string? solution_code { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasProductionanmaly.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasProductionanmaly.cs index d25344c5..899b8406 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasProductionanmaly.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasProductionanmaly.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产异常 +/// +[SugarTable("bas_productionanmaly")] +public partial class BasProductionanmaly : BaseEntity { - /// - ///生产异常 - /// - [SugarTable("bas_productionanmaly")] - public partial class BasProductionanmaly + public BasProductionanmaly() { - public BasProductionanmaly(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public long? ordinal {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:删除用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:有效标志 - /// Default: - /// Nullable:True - /// - public int? status {get;set;} - - /// - /// Desc:异常编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? anomaly_id {get;set;} - - /// - /// Desc:异常名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? anomaly_name {get;set;} - - /// - /// Desc:异常类型 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? anomaly_type {get;set;} - - /// - /// Desc:状态说明 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? anomaly_state {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 排序 + /// + public long? ordinal { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 有效标志 + /// + public int? status { get; set; } + + /// + /// 异常编码 + /// + public string? anomaly_id { get; set; } + + /// + /// 异常名称 + /// + public string? anomaly_name { get; set; } + + /// + /// 异常类型 + /// + public string? anomaly_type { get; set; } + + /// + /// 状态说明 + /// + public string? anomaly_state { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasRack.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRack.cs index c57c79f2..458283c5 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasRack.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasRack.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 仓库货架 +/// +[SugarTable("bas_rack")] +public partial class BasRack : BaseEntity { - /// - ///仓库货架 - /// - [SugarTable("bas_rack")] - public partial class BasRack + public BasRack() { - public BasRack(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:货架Code - /// Default: - /// Nullable:False - /// - public string rack_code {get;set;} = string.Empty; - - /// - /// Desc:区域ID - /// Default: - /// Nullable:False - /// - public string region_id {get;set;} = string.Empty; - - /// - /// Desc:层数 - /// Default: - /// Nullable:False - /// - public int layers {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 货架Code + /// + public string rack_code { get; set; } = string.Empty; + + /// + /// 区域ID + /// + public string region_id { get; set; } = string.Empty; + + /// + /// 层数 + /// + public int layers { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasRegion.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRegion.cs index 98d65324..21b64a90 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasRegion.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasRegion.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 仓库区域 +/// +[SugarTable("bas_region")] +public partial class BasRegion : BaseEntity { - /// - ///仓库区域 - /// - [SugarTable("bas_region")] - public partial class BasRegion + public BasRegion() { - public BasRegion(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:仓库ID - /// Default: - /// Nullable:False - /// - public string wh_id {get;set;} = string.Empty; - - /// - /// Desc:区域代码 - /// Default: - /// Nullable:False - /// - public string region_code {get;set;} = string.Empty; - - /// - /// Desc:区域名称 - /// Default: - /// Nullable:False - /// - public string region_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 仓库ID + /// + public string wh_id { get; set; } = string.Empty; + + /// + /// 区域代码 + /// + public string region_code { get; set; } = string.Empty; + + /// + /// 区域名称 + /// + public string region_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasRegionUser.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRegionUser.cs index 84a96196..83eaa9dc 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasRegionUser.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasRegionUser.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 区域人员设定 +/// +[SugarTable("bas_region_user")] +public partial class BasRegionUser : BaseEntity { - /// - ///区域人员设定 - /// - [SugarTable("bas_region_user")] - public partial class BasRegionUser + public BasRegionUser() { - public BasRegionUser(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:区域ID - /// Default: - /// Nullable:False - /// - public string region_id {get;set;} = string.Empty; - - /// - /// Desc:区域代码 - /// Default: - /// Nullable:False - /// - public string region_code {get;set;} = string.Empty; - - /// - /// Desc:用户ID - /// Default: - /// Nullable:False - /// - public string user_id {get;set;} = string.Empty; - - /// - /// Desc:用户名 - /// Default: - /// Nullable:False - /// - public string user_name {get;set;} = string.Empty; - - /// - /// Desc:姓名 - /// Default: - /// Nullable:False - /// - public string full_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 区域ID + /// + public string region_id { get; set; } = string.Empty; + + /// + /// 区域代码 + /// + public string region_code { get; set; } = string.Empty; + + /// + /// 用户ID + /// + public string user_id { get; set; } = string.Empty; + + /// + /// 用户名 + /// + public string user_name { get; set; } = string.Empty; + + /// + /// 姓名 + /// + public string full_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs index 980d5b47..72ba3173 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasRouteD.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工艺路线子表 +/// +[SugarTable("bas_route_d")] +public partial class BasRouteD : BaseEntity { - /// - ///工艺路线子表 - /// - [SugarTable("bas_route_d")] - public partial class BasRouteD + public BasRouteD() { - public BasRouteD(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工艺路线ID - /// Default: - /// Nullable:False - /// - public string route_id {get;set;} = string.Empty; - - /// - /// Desc:工序id - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:工序名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_name {get;set;} - - /// - /// Desc:处理时间 - /// Default: - /// Nullable:True - /// - public decimal? process_time {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public long? ordinal {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:状态 - /// Default: - /// Nullable:True - /// - public int? status {get;set;} - - /// - /// Desc:单次扫码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? single_scan_type {get;set;} - - /// - /// Desc:工位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? station {get;set;} - - /// - /// Desc:一码到底 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? only_scan_type {get;set;} - - /// - /// Desc:用料追溯关系 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_traced_back_relationship {get;set;} - - /// - /// Desc:不合格产品投产 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? defective_products_put_into_production {get;set;} - - /// - /// Desc:报告模板 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? report_template {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:附件 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? attachment {get;set;} - - /// - /// Desc:接续方式 1 前序结束之后可以开始 2 前序开始后可以开始 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? connection_method {get;set;} - - /// - /// Desc:准备时间(秒) - /// Default: - /// Nullable:True - /// - public decimal? preparation_time {get;set;} - - /// - /// Desc:产出比 - /// Default: - /// Nullable:True - /// - public decimal? output_ratio {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工艺路线ID + /// + public string route_id { get; set; } = string.Empty; + + /// + /// 工序id + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 工序名称 + /// + public string? process_name { get; set; } + + /// + /// 处理时间 + /// + public decimal? process_time { get; set; } + + /// + /// 排序 + /// + public long? ordinal { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 状态 + /// + public int? status { get; set; } + + /// + /// 单次扫码 + /// + public string? single_scan_type { get; set; } + + /// + /// 工位 + /// + public string? station { get; set; } + + /// + /// 一码到底 + /// + public string? only_scan_type { get; set; } + + /// + /// 用料追溯关系 + /// + public string? material_traced_back_relationship { get; set; } + + /// + /// 不合格产品投产 + /// + public string? defective_products_put_into_production { get; set; } + + /// + /// 报告模板 + /// + public string? report_template { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 附件 + /// + public string? attachment { get; set; } + + /// + /// 接续方式 1 前序结束之后可以开始 2 前序开始后可以开始 + /// + public string? connection_method { get; set; } + + /// + /// 准备时间(秒) + /// + public decimal? preparation_time { get; set; } + + /// + /// 产出比 + /// + public decimal? output_ratio { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasRouteH.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasRouteH.cs index 598a822d..d560ef8b 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasRouteH.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasRouteH.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工艺路线 +/// +[SugarTable("bas_route_h")] +public partial class BasRouteH : BaseEntity { - /// - ///工艺路线 - /// - [SugarTable("bas_route_h")] - public partial class BasRouteH + public BasRouteH() { - public BasRouteH(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - public string code {get;set;} = string.Empty; - - /// - /// Desc:名称 - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:有效开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:有效结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:0 未发布 1 已发布 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:是否永远有效 - /// Default: - /// Nullable:False - /// - public int is_always_valid {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 编号 + /// + public string code { get; set; } = string.Empty; + + /// + /// 名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 有效开始时间 + /// + public DateTime? start_time { get; set; } + + /// + /// 有效结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 0 未发布 1 已发布 + /// + public string status { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 是否永远有效 + /// + public int is_always_valid { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSbomD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSbomD.cs index a9c03f31..6bef0694 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSbomD.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSbomD.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品标准BOM明细 +/// +[SugarTable("bas_sbom_d")] +public partial class BasSbomD : BaseEntity { - /// - ///产品标准BOM明细 - /// - [SugarTable("bas_sbom_d")] - public partial class BasSbomD + public BasSbomD() { - public BasSbomD(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:标准BOM主档ID，BAS_SBOM_H.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? sbom_id {get;set;} - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string subm_code {get;set;} = string.Empty; - - /// - /// Desc:物料单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? sub_unit {get;set;} - - /// - /// Desc:单件用量 - /// Default: - /// Nullable:True - /// - public decimal? sub_qty {get;set;} - - /// - /// Desc:位号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? sub_location {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 标准BOM主档ID，BAS_SBOM_H.ID + /// + public string? sbom_id { get; set; } + + /// + /// 物料代码 + /// + public string subm_code { get; set; } = string.Empty; + + /// + /// 物料单位 + /// + public string? sub_unit { get; set; } + + /// + /// 单件用量 + /// + public decimal? sub_qty { get; set; } + + /// + /// 位号 + /// + public string? sub_location { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSbomH.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSbomH.cs index 423f0428..82291df0 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSbomH.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSbomH.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 产品标准BOM主档 +/// +[SugarTable("bas_sbom_h")] +public partial class BasSbomH : BaseEntity { - /// - ///产品标准BOM主档 - /// - [SugarTable("bas_sbom_h")] - public partial class BasSbomH + public BasSbomH() { - public BasSbomH(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenanti_d {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品ID，BAS_ITEM.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_id {get;set;} - - /// - /// Desc:产品代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:BOM类型： 量产BOM：Standard 返工BOM：Rework 试制BOM：Trial 返修BOM：RMA 包装BOM：Pack - /// Default: - /// Nullable:False - /// - public string bom_type {get;set;} = string.Empty; - - /// - /// Desc:BOM版本 - /// Default: - /// Nullable:False - /// - public string version {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenanti_d { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品ID，BAS_ITEM.ID + /// + public string? item_id { get; set; } + + /// + /// 产品代码 + /// + public string? item_code { get; set; } + + /// + /// BOM类型： 量产BOM：Standard 返工BOM：Rework 试制BOM：Trial 返修BOM：RMA 包装BOM：Pack + /// + public string bom_type { get; set; } = string.Empty; + + /// + /// BOM版本 + /// + public string version { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasShift.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasShift.cs index fc464ae4..4727d387 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasShift.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasShift.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 班次资料 +/// +[SugarTable("bas_shift")] +public partial class BasShift : BaseEntity { - /// - ///班次资料 - /// - [SugarTable("bas_shift")] - public partial class BasShift + public BasShift() { - public BasShift(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:班次名称 - /// Default: - /// Nullable:False - /// - public string shift_name {get;set;} = string.Empty; - - /// - /// Desc:所属班制ID，BAS_SHIFTTYPE.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shifttype_id {get;set;} - - /// - /// Desc:所属班制代码 - /// Default: - /// Nullable:False - /// - public string shifttype_code {get;set;} = string.Empty; - - /// - /// Desc:开始时间 - /// Default: - /// Nullable:False - /// - public string shiftb_time {get;set;} = string.Empty; - - /// - /// Desc:结束时间 - /// Default: - /// Nullable:False - /// - public string shifte_time {get;set;} = string.Empty; - - /// - /// Desc:是否跨天 - /// Default: - /// Nullable:False - /// - public string is_overday {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 班次名称 + /// + public string shift_name { get; set; } = string.Empty; + + /// + /// 所属班制ID，BAS_SHIFTTYPE.ID + /// + public string? shifttype_id { get; set; } + + /// + /// 所属班制代码 + /// + public string shifttype_code { get; set; } = string.Empty; + + /// + /// 开始时间 + /// + public string shiftb_time { get; set; } = string.Empty; + + /// + /// 结束时间 + /// + public string shifte_time { get; set; } = string.Empty; + + /// + /// 是否跨天 + /// + public string is_overday { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasShiftType.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasShiftType.cs index 1f9ebe2d..bbeb6051 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasShiftType.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasShiftType.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 班制资料类型 +/// +[SugarTable("bas_shift_type")] +public partial class BasShiftType : BaseEntity { - /// - ///班制资料类型 - /// - [SugarTable("bas_shift_type")] - public partial class BasShiftType + public BasShiftType() { - public BasShiftType(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shifttype_code {get;set;} = string.Empty; - - /// - /// Desc:班制名称 - /// Default: - /// Nullable:False - /// - public string shifttype_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 班制代码 + /// + public string shifttype_code { get; set; } = string.Empty; + + /// + /// 班制名称 + /// + public string shifttype_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSkill.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSkill.cs index e9c5c1f2..c1411654 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSkill.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSkill.cs @@ -1,91 +1,62 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 技能维护 +/// +[SugarTable("bas_skill")] +public partial class BasSkill : BaseEntity { - /// - ///技能维护 - /// - [SugarTable("bas_skill")] - public partial class BasSkill + public BasSkill() { - public BasSkill(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:技能代码 - /// Default: - /// Nullable:False - /// - public string skill_code {get;set;} = string.Empty; - - /// - /// Desc:技能描述 - /// Default: - /// Nullable:False - /// - public string skill_desc {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 技能代码 + /// + public string skill_code { get; set; } = string.Empty; + + /// + /// 技能描述 + /// + public string skill_desc { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSkillLevel.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSkillLevel.cs index ee4e28ab..dcf2d669 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSkillLevel.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSkillLevel.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 人员技能等级 +/// +[SugarTable("bas_skill_level")] +public partial class BasSkillLevel : BaseEntity { - /// - ///人员技能等级 - /// - [SugarTable("bas_skill_level")] - public partial class BasSkillLevel + public BasSkillLevel() { - public BasSkillLevel(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:技能等级 - /// Default: - /// Nullable:False - /// - public string skill_levle_code {get;set;} = string.Empty; - - /// - /// Desc:技能等级描述 - /// Default: - /// Nullable:False - /// - public string skill_levle_desc {get;set;} = string.Empty; - - /// - /// Desc:是否能上岗 - /// Default: - /// Nullable:False - /// - public int is_work {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 技能等级 + /// + public string skill_levle_code { get; set; } = string.Empty; + + /// + /// 技能等级描述 + /// + public string skill_levle_desc { get; set; } = string.Empty; + + /// + /// 是否能上岗 + /// + public int is_work { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSkillProcess.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSkillProcess.cs index 0e9aadf4..5c7483f8 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSkillProcess.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSkillProcess.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 技能与工序的关系 +/// +[SugarTable("bas_skill_process")] +public partial class BasSkillProcess : BaseEntity { - /// - ///技能与工序的关系 - /// - [SugarTable("bas_skill_process")] - public partial class BasSkillProcess + public BasSkillProcess() { - public BasSkillProcess(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:技能ID，PERF_SKILL.ID - /// Default: - /// Nullable:False - /// - public string skill_id {get;set;} = string.Empty; - - /// - /// Desc:工序ID，BAS_PROCESS.ID - /// Default: - /// Nullable:False - /// - public string process_id {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 技能ID，PERF_SKILL.ID + /// + public string skill_id { get; set; } = string.Empty; + + /// + /// 工序ID，BAS_PROCESS.ID + /// + public string process_id { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasStaffSkill.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasStaffSkill.cs index efec1ab8..9668a486 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasStaffSkill.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasStaffSkill.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 员工技能设置 +/// +[SugarTable("bas_staff_skill")] +public partial class BasStaffSkill : BaseEntity { - /// - ///员工技能设置 - /// - [SugarTable("bas_staff_skill")] - public partial class BasStaffSkill + public BasStaffSkill() { - public BasStaffSkill(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:用户ID,SYS_USERS.ID - /// Default: - /// Nullable:False - /// - public string user_id {get;set;} = string.Empty; - - /// - /// Desc:用户名，SYS_USERS.USERNAME - /// Default: - /// Nullable:False - /// - public string user_name {get;set;} = string.Empty; - - /// - /// Desc:技能ID，PERF_SKILL.ID - /// Default: - /// Nullable:False - /// - public string skill_id {get;set;} = string.Empty; - - /// - /// Desc:技能等级ID，PERF_SKILLLEVEL.ID - /// Default: - /// Nullable:False - /// - public string skill_level_id {get;set;} = string.Empty; - - /// - /// Desc:生效日期 - /// Default: - /// Nullable:False - /// - public DateTime effective_date {get;set;} - - /// - /// Desc:失效日期 - /// Default: - /// Nullable:False - /// - public DateTime expiry_date {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 用户ID,SYS_USERS.ID + /// + public string user_id { get; set; } = string.Empty; + + /// + /// 用户名，SYS_USERS.USERNAME + /// + public string user_name { get; set; } = string.Empty; + + /// + /// 技能ID，PERF_SKILL.ID + /// + public string skill_id { get; set; } = string.Empty; + + /// + /// 技能等级ID，PERF_SKILLLEVEL.ID + /// + public string skill_level_id { get; set; } = string.Empty; + + /// + /// 生效日期 + /// + public DateTime effective_date { get; set; } = DateTime.Now; + + /// + /// 失效日期 + /// + public DateTime expiry_date { get; set; } = DateTime.Now; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasStep.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasStep.cs index ff1e1f47..2557f1ca 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasStep.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasStep.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工步 +/// +[SugarTable("bas_step")] +public partial class BasStep : BaseEntity { - /// - ///工步 - /// - [SugarTable("bas_step")] - public partial class BasStep + public BasStep() { - public BasStep(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工步代码 - /// Default: - /// Nullable:False - /// - public string step_code {get;set;} = string.Empty; - - /// - /// Desc:工步名称 - /// Default: - /// Nullable:False - /// - public string step_name {get;set;} = string.Empty; - - /// - /// Desc:工序ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_id {get;set;} - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:强制顺序 - /// Default: - /// Nullable:False - /// - public string must_order {get;set;} = string.Empty; - - /// - /// Desc:处理时间 - /// Default: - /// Nullable:True - /// - public int? steps_time {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工步代码 + /// + public string step_code { get; set; } = string.Empty; + + /// + /// 工步名称 + /// + public string step_name { get; set; } = string.Empty; + + /// + /// 工序ID + /// + public string? process_id { get; set; } + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 强制顺序 + /// + public string must_order { get; set; } = string.Empty; + + /// + /// 处理时间 + /// + public int? steps_time { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasStepBom.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasStepBom.cs index 32dbc679..149425bd 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasStepBom.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasStepBom.cs @@ -1,175 +1,122 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工步BOM明细 +/// +[SugarTable("bas_step_bom")] +public partial class BasStepBom : BaseEntity { - /// - ///工步BOM明细 - /// - [SugarTable("bas_step_bom")] - public partial class BasStepBom + public BasStepBom() { - public BasStepBom(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工序BOM版本 - /// Default: - /// Nullable:False - /// - public string version {get;set;} = string.Empty; - - /// - /// Desc:工步代码 - /// Default: - /// Nullable:False - /// - public string step_code {get;set;} = string.Empty; - - /// - /// Desc:物料顺序号 - /// Default: - /// Nullable:False - /// - public int sub_seq {get;set;} - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string subm_code {get;set;} = string.Empty; - - /// - /// Desc:物料单位 - /// Default: - /// Nullable:False - /// - public string sub_unit {get;set;} = string.Empty; - - /// - /// Desc:单件用量 - /// Default: - /// Nullable:False - /// - public decimal sub_qty {get;set;} - - /// - /// Desc:位号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? sub_location {get;set;} - - /// - /// Desc:物料用途： 1：消耗的物料（主料） 2：消耗用辅料（辅料） - /// Default: - /// Nullable:False - /// - public int usetype {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工序BOM版本 + /// + public string version { get; set; } = string.Empty; + + /// + /// 工步代码 + /// + public string step_code { get; set; } = string.Empty; + + /// + /// 物料顺序号 + /// + public int sub_seq { get; set; } + + /// + /// 物料代码 + /// + public string subm_code { get; set; } = string.Empty; + + /// + /// 物料单位 + /// + public string sub_unit { get; set; } = string.Empty; + + /// + /// 单件用量 + /// + public decimal sub_qty { get; set; } + + /// + /// 位号 + /// + public string? sub_location { get; set; } + + /// + /// 物料用途： 1：消耗的物料（主料） 2：消耗用辅料（辅料） + /// + public int usetype { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSubstitutionMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSubstitutionMaterial.cs index 3578f8ca..37fa9851 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSubstitutionMaterial.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSubstitutionMaterial.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 替代料关系表 +/// +[SugarTable("bas_substitution_material")] +public partial class BasSubstitutionMaterial : BaseEntity { - /// - ///替代料关系表 - /// - [SugarTable("bas_substitution_material")] - public partial class BasSubstitutionMaterial + public BasSubstitutionMaterial() { - public BasSubstitutionMaterial(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:物料id - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:替代料id - /// Default: - /// Nullable:False - /// - public string sub_material_id {get;set;} = string.Empty; - - /// - /// Desc:替代比例，如1（一个物料可以用一个替代料代替） - /// Default: - /// Nullable:False - /// - public decimal proportion {get;set;} - - /// - /// Desc:是否相互替代 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? is_mutual {get;set;} - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 物料id + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 替代料id + /// + public string sub_material_id { get; set; } = string.Empty; + + /// + /// 替代比例，如1（一个物料可以用一个替代料代替） + /// + public decimal proportion { get; set; } + + /// + /// 是否相互替代 + /// + public string? is_mutual { get; set; } + + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplier.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplier.cs index fe5e53e6..c5df96ee 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplier.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplier.cs @@ -1,175 +1,122 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 供应商信息 +/// +[SugarTable("bas_supplier")] +public partial class BasSupplier : BaseEntity { - /// - ///供应商信息 - /// - [SugarTable("bas_supplier")] - public partial class BasSupplier + public BasSupplier() { - public BasSupplier(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:供应商代码 - /// Default: - /// Nullable:False - /// - public string supplier_code {get;set;} = string.Empty; - - /// - /// Desc:供应商名称 - /// Default: - /// Nullable:False - /// - public string supplier_name {get;set;} = string.Empty; - - /// - /// Desc:供应商简称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shortname {get;set;} - - /// - /// Desc:详细地址 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fulladdress {get;set;} - - /// - /// Desc:邮编 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? postal_code {get;set;} - - /// - /// Desc:国家 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? country {get;set;} - - /// - /// Desc:省 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? province {get;set;} - - /// - /// Desc:市 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? city {get;set;} - - /// - /// Desc:区 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? district {get;set;} - - /// - /// Desc:街道地址 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? street {get;set;} - - /// - /// Desc:联系人姓名 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_name {get;set;} - - /// - /// Desc:联系人电话 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_phone {get;set;} - - /// - /// Desc:联系人手机 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_mobile {get;set;} - - /// - /// Desc:默认委外仓库 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? default_os_stock {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 供应商代码 + /// + public string supplier_code { get; set; } = string.Empty; + + /// + /// 供应商名称 + /// + public string supplier_name { get; set; } = string.Empty; + + /// + /// 供应商简称 + /// + public string? shortname { get; set; } + + /// + /// 详细地址 + /// + public string? fulladdress { get; set; } + + /// + /// 邮编 + /// + public string? postal_code { get; set; } + + /// + /// 国家 + /// + public string? country { get; set; } + + /// + /// 省 + /// + public string? province { get; set; } + + /// + /// 市 + /// + public string? city { get; set; } + + /// + /// 区 + /// + public string? district { get; set; } + + /// + /// 街道地址 + /// + public string? street { get; set; } + + /// + /// 联系人姓名 + /// + public string? contact_name { get; set; } + + /// + /// 联系人电话 + /// + public string? contact_phone { get; set; } + + /// + /// 联系人手机 + /// + public string? contact_mobile { get; set; } + + /// + /// 默认委外仓库 + /// + public string? default_os_stock { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs index 6661887f..8c438040 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs @@ -1,134 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Yitter.IdGenerator; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 供应商联系人 +/// +[SugarTable("bas_supplier_contact")] +public partial class BasSupplierContact : BaseEntity { - /// - ///供应商联系人 - /// - [SugarTable("bas_supplier_contact")] - public partial class BasSupplierContact + public BasSupplierContact() { - public BasSupplierContact(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public long supplierid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? phone {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public short ismaincontact {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long supplierid { get; set; } + + /// + /// TODO + /// + public string name { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? phone { get; set; } + + /// + /// TODO + /// + public short ismaincontact { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendar.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendar.cs index a83b71f5..333f3649 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendar.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendar.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 时间日历 +/// +[SugarTable("bas_time_calendar")] +public partial class BasTimeCalendar : BaseEntity { - /// - ///时间日历 - /// - [SugarTable("bas_time_calendar")] - public partial class BasTimeCalendar + public BasTimeCalendar() { - public BasTimeCalendar(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:日期 - /// Default: - /// Nullable:False - /// - public DateTime date {get;set;} - - /// - /// Desc:第几周 - /// Default: - /// Nullable:False - /// - public int dateint {get;set;} - - /// - /// Desc:周 - /// Default: - /// Nullable:False - /// - public int week {get;set;} - - /// - /// Desc:月 - /// Default: - /// Nullable:False - /// - public int month {get;set;} - - /// - /// Desc:季 - /// Default: - /// Nullable:False - /// - public int quarter {get;set;} - - /// - /// Desc:年 - /// Default: - /// Nullable:False - /// - public int year {get;set;} - - /// - /// Desc:是否工作日 - /// Default: - /// Nullable:False - /// - public int is_workday {get;set;} - - /// - /// Desc:周的第几天 - /// Default: - /// Nullable:False - /// - public int dayofweek {get;set;} - - /// - /// Desc:年的第几天 - /// Default: - /// Nullable:False - /// - public int dayofyear {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 日期 + /// + public DateTime date { get; set; } = DateTime.Now; + + /// + /// 第几周 + /// + public int dateint { get; set; } + + /// + /// 周 + /// + public int week { get; set; } + + /// + /// 月 + /// + public int month { get; set; } + + /// + /// 季 + /// + public int quarter { get; set; } + + /// + /// 年 + /// + public int year { get; set; } + + /// + /// 是否工作日 + /// + public int is_workday { get; set; } + + /// + /// 周的第几天 + /// + public int dayofweek { get; set; } + + /// + /// 年的第几天 + /// + public int dayofyear { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendarRule.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendarRule.cs index d72e2228..891e2c8e 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendarRule.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasTimeCalendarRule.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 时间日历规则 +/// +[SugarTable("bas_time_calendar_rule")] +public partial class BasTimeCalendarRule : BaseEntity { - /// - ///时间日历规则 - /// - [SugarTable("bas_time_calendar_rule")] - public partial class BasTimeCalendarRule + public BasTimeCalendarRule() { - public BasTimeCalendarRule(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:年份(1900,9999) - /// Default: - /// Nullable:False - /// - public int year {get;set;} - - /// - /// Desc:周的第一天(1,7) - /// Default: - /// Nullable:False - /// - public string firstdayofweek {get;set;} = string.Empty; - - /// - /// Desc:工作日 - /// Default: - /// Nullable:False - /// - public string workday {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:周的第一天 - /// Default: - /// Nullable:True - /// - public string? firstdayofweek_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 年份(1900,9999) + /// + public int year { get; set; } + + /// + /// 周的第一天(1,7) + /// + public string firstdayofweek { get; set; } = string.Empty; + + /// + /// 工作日 + /// + public string workday { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 周的第一天 + /// + public string? firstdayofweek_name { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasTimeDimension.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasTimeDimension.cs index b76cbe43..ee691041 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasTimeDimension.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasTimeDimension.cs @@ -1,77 +1,52 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 系统时间维度 +/// +[SugarTable("bas_time_dimension")] +public partial class BasTimeDimension : BaseEntity { - /// - ///系统时间维度 - /// - [SugarTable("bas_time_dimension")] - public partial class BasTimeDimension + public BasTimeDimension() { - public BasTimeDimension(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:日期 - /// Default: - /// Nullable:False - /// - public DateTime ddate {get;set;} - - /// - /// Desc:周别 - /// Default: - /// Nullable:False - /// - public int dweek {get;set;} - - /// - /// Desc:周几 - /// Default: - /// Nullable:False - /// - public int dweekday {get;set;} - - /// - /// Desc:月份 - /// Default: - /// Nullable:False - /// - public int dmonth {get;set;} - - /// - /// Desc:季度 - /// Default: - /// Nullable:False - /// - public int quarter {get;set;} - - /// - /// Desc:年份 - /// Default: - /// Nullable:False - /// - public int year {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 日期 + /// + public DateTime ddate { get; set; } = DateTime.Now; + + /// + /// 周别 + /// + public int dweek { get; set; } + + /// + /// 周几 + /// + public int dweekday { get; set; } + + /// + /// 月份 + /// + public int dmonth { get; set; } + + /// + /// 季度 + /// + public int quarter { get; set; } + + /// + /// 年份 + /// + public int year { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriod.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriod.cs index 5f57425a..ed86d64a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriod.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriod.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 时段维护 +/// +[SugarTable("bas_time_period")] +public partial class BasTimePeriod : BaseEntity { - /// - ///时段维护 - /// - [SugarTable("bas_time_period")] - public partial class BasTimePeriod + public BasTimePeriod() { - public BasTimePeriod(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:时段名称 - /// Default: - /// Nullable:False - /// - public string tp_name {get;set;} = string.Empty; - - /// - /// Desc:时段顺序 - /// Default: - /// Nullable:True - /// - public int? tp_seq {get;set;} - - /// - /// Desc:所属班制ID，BAS_SHIFTTYPE.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shifttype_id {get;set;} - - /// - /// Desc:所属班制代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shifttype_code {get;set;} - - /// - /// Desc:所属班制ID，BAS_SHIFT.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shift_id {get;set;} - - /// - /// Desc:所属班次代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shift_code {get;set;} - - /// - /// Desc:开始时间 - /// Default: - /// Nullable:False - /// - public string tpb_time {get;set;} = string.Empty; - - /// - /// Desc:结束时间 - /// Default: - /// Nullable:False - /// - public string tpe_time {get;set;} = string.Empty; - - /// - /// Desc:是否跨天 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? is_overday {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:工作时间 - /// Default: - /// Nullable:True - /// - public DateTime? worktime {get;set;} - - /// - /// Desc:时间戳(用于并发) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 时段名称 + /// + public string tp_name { get; set; } = string.Empty; + + /// + /// 时段顺序 + /// + public int? tp_seq { get; set; } + + /// + /// 所属班制ID，BAS_SHIFTTYPE.ID + /// + public string? shifttype_id { get; set; } + + /// + /// 所属班制代码 + /// + public string? shifttype_code { get; set; } + + /// + /// 所属班制ID，BAS_SHIFT.ID + /// + public string? shift_id { get; set; } + + /// + /// 所属班次代码 + /// + public string? shift_code { get; set; } + + /// + /// 开始时间 + /// + public string tpb_time { get; set; } = string.Empty; + + /// + /// 结束时间 + /// + public string tpe_time { get; set; } = string.Empty; + + /// + /// 是否跨天 + /// + public string? is_overday { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 工作时间 + /// + public DateTime? worktime { get; set; } + + /// + /// 时间戳(用于并发) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriodRest.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriodRest.cs index 306042f0..101e8b43 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriodRest.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasTimePeriodRest.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 休息时段 +/// +[SugarTable("bas_time_period_rest")] +public partial class BasTimePeriodRest : BaseEntity { - /// - ///休息时段 - /// - [SugarTable("bas_time_period_rest")] - public partial class BasTimePeriodRest + public BasTimePeriodRest() { - public BasTimePeriodRest(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:时段名称 - /// Default: - /// Nullable:False - /// - public string tp_name {get;set;} = string.Empty; - - /// - /// Desc:所属班制ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shift_type_id {get;set;} - - /// - /// Desc:所属班制代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shift_type_code {get;set;} - - /// - /// Desc:所属班次ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shift_id {get;set;} - - /// - /// Desc:所属班制代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? shif_tcode {get;set;} - - /// - /// Desc:时段ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_period_id {get;set;} - - /// - /// Desc:时段代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_period_code {get;set;} - - /// - /// Desc:开始时间 - /// Default: - /// Nullable:False - /// - public string tp_b_time {get;set;} = string.Empty; - - /// - /// Desc:结束时间 - /// Default: - /// Nullable:False - /// - public string tp_e_time {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 时段名称 + /// + public string tp_name { get; set; } = string.Empty; + + /// + /// 所属班制ID + /// + public string? shift_type_id { get; set; } + + /// + /// 所属班制代码 + /// + public string? shift_type_code { get; set; } + + /// + /// 所属班次ID + /// + public string? shift_id { get; set; } + + /// + /// 所属班制代码 + /// + public string? shif_tcode { get; set; } + + /// + /// 时段ID + /// + public string? time_period_id { get; set; } + + /// + /// 时段代码 + /// + public string? time_period_code { get; set; } + + /// + /// 开始时间 + /// + public string tp_b_time { get; set; } = string.Empty; + + /// + /// 结束时间 + /// + public string tp_e_time { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasUnit.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasUnit.cs index e537fc1f..53da842b 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasUnit.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasUnit.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 单位信息 +/// +[SugarTable("bas_unit")] +public partial class BasUnit : BaseEntity { - /// - ///单位信息 - /// - [SugarTable("bas_unit")] - public partial class BasUnit + public BasUnit() { - public BasUnit(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:单位名称 - /// Default: - /// Nullable:False - /// - public string unit_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:状态判断 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? state {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 单位名称 + /// + public string unit_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 状态判断 + /// + public short? state { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWarehouse.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWarehouse.cs index 8d4d9fd7..57ffcd40 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWarehouse.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWarehouse.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 仓库资料 +/// +[SugarTable("bas_warehouse")] +public partial class BasWarehouse : BaseEntity { - /// - ///仓库资料 - /// - [SugarTable("bas_warehouse")] - public partial class BasWarehouse + public BasWarehouse() { - public BasWarehouse(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:仓库代码 - /// Default: - /// Nullable:False - /// - public string whcode {get;set;} = string.Empty; - - /// - /// Desc:仓库名称 - /// Default: - /// Nullable:False - /// - public string whname {get;set;} = string.Empty; - - /// - /// Desc:是否委外仓 - /// Default: - /// Nullable:False - /// - public int is_osstock {get;set;} - - /// - /// Desc:是否特殊仓 - /// Default: - /// Nullable:False - /// - public int is_specialstock {get;set;} - - /// - /// Desc:所属部门 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? department_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 仓库代码 + /// + public string whcode { get; set; } = string.Empty; + + /// + /// 仓库名称 + /// + public string whname { get; set; } = string.Empty; + + /// + /// 是否委外仓 + /// + public int is_osstock { get; set; } + + /// + /// 是否特殊仓 + /// + public int is_specialstock { get; set; } + + /// + /// 所属部门 + /// + public string? department_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenter.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenter.cs index 2e23c788..b1cd8c2f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenter.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenter.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工作中心表 +/// +[SugarTable("bas_workcenter")] +public partial class BasWorkcenter : BaseEntity { - /// - ///工作中心表 - /// - [SugarTable("bas_workcenter")] - public partial class BasWorkcenter + public BasWorkcenter() { - public BasWorkcenter(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工作中心代码 - /// Default: - /// Nullable:False - /// - public string workcenter_code {get;set;} = string.Empty; - - /// - /// Desc:工作中心名称 - /// Default: - /// Nullable:False - /// - public string workcenter_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:车间(工段)代码，SEGMENT.SEGMENTCODE - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:车间(工段)ID，SEGMENT.ID - /// Default: - /// Nullable:False - /// - public string segment_id {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工作中心代码 + /// + public string workcenter_code { get; set; } = string.Empty; + + /// + /// 工作中心名称 + /// + public string workcenter_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 车间(工段)代码，SEGMENT.SEGMENTCODE + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 车间(工段)ID，SEGMENT.ID + /// + public string segment_id { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterLine.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterLine.cs index 6450f91e..8e3e15b3 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterLine.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterLine.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工作中心与产线关系表 +/// +[SugarTable("bas_workcenter_line")] +public partial class BasWorkcenterLine : BaseEntity { - /// - ///工作中心与产线关系表 - /// - [SugarTable("bas_workcenter_line")] - public partial class BasWorkcenterLine + public BasWorkcenterLine() { - public BasWorkcenterLine(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工作中心ID - /// Default: - /// Nullable:False - /// - public string workcenter_id {get;set;} = string.Empty; - - /// - /// Desc:工作中心代码 - /// Default: - /// Nullable:False - /// - public string workcenter_code {get;set;} = string.Empty; - - /// - /// Desc:产线ID，PRODUCTIONLINE.ID - /// Default: - /// Nullable:False - /// - public string productionline_id {get;set;} = string.Empty; - - /// - /// Desc:产线代码，PRODUCTIONLINE.PRODUCTIONLINECODE - /// Default: - /// Nullable:False - /// - public string productionline_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工作中心ID + /// + public string workcenter_id { get; set; } = string.Empty; + + /// + /// 工作中心代码 + /// + public string workcenter_code { get; set; } = string.Empty; + + /// + /// 产线ID，PRODUCTIONLINE.ID + /// + public string productionline_id { get; set; } = string.Empty; + + /// + /// 产线代码，PRODUCTIONLINE.PRODUCTIONLINECODE + /// + public string productionline_code { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterStation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterStation.cs index 5bc9de34..1b26cce4 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterStation.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkcenterStation.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工作中心与工位关系表 +/// +[SugarTable("bas_workcenter_station")] +public partial class BasWorkcenterStation : BaseEntity { - /// - ///工作中心与工位关系表 - /// - [SugarTable("bas_workcenter_station")] - public partial class BasWorkcenterStation + public BasWorkcenterStation() { - public BasWorkcenterStation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工作中心ID - /// Default: - /// Nullable:False - /// - public string workcenter_id {get;set;} = string.Empty; - - /// - /// Desc:工作中心代码 - /// Default: - /// Nullable:False - /// - public string workcenter_code {get;set;} = string.Empty; - - /// - /// Desc:工位ID，STATION.ID - /// Default: - /// Nullable:False - /// - public string station_id {get;set;} = string.Empty; - - /// - /// Desc:工位代码，STATION.STATIONCODE - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳(用于并发处理) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工作中心ID + /// + public string workcenter_id { get; set; } = string.Empty; + + /// + /// 工作中心代码 + /// + public string workcenter_code { get; set; } = string.Empty; + + /// + /// 工位ID，STATION.ID + /// + public string station_id { get; set; } = string.Empty; + + /// + /// 工位代码，STATION.STATIONCODE + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 时间戳(用于并发处理) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroup.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroup.cs index 17154ea7..daa66f8c 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroup.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroup.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 班组信息 +/// +[SugarTable("bas_workgroup")] +public partial class BasWorkgroup : BaseEntity { - /// - ///班组信息 - /// - [SugarTable("bas_workgroup")] - public partial class BasWorkgroup + public BasWorkgroup() { - public BasWorkgroup(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:班组代码 - /// Default: - /// Nullable:False - /// - public string group_code {get;set;} = string.Empty; - - /// - /// Desc:班组名称 - /// Default: - /// Nullable:False - /// - public string group_name {get;set;} = string.Empty; - - /// - /// Desc:车间(工段)代码，SEGMENT.SEGMENTCODE - /// Default: - /// Nullable:False - /// - public string segment_id {get;set;} = string.Empty; - - /// - /// Desc:车间代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? segment_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? state {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 班组代码 + /// + public string group_code { get; set; } = string.Empty; + + /// + /// 班组名称 + /// + public string group_name { get; set; } = string.Empty; + + /// + /// 车间(工段)代码，SEGMENT.SEGMENTCODE + /// + public string segment_id { get; set; } = string.Empty; + + /// + /// 车间代码 + /// + public string? segment_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 状态 + /// + public string? state { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupEmployee.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupEmployee.cs index c75490da..37e44e81 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupEmployee.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupEmployee.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 班组与员工关系 +/// +[SugarTable("bas_workgroup_employee")] +public partial class BasWorkgroupEmployee : BaseEntity { - /// - ///班组与员工关系 - /// - [SugarTable("bas_workgroup_employee")] - public partial class BasWorkgroupEmployee + public BasWorkgroupEmployee() { - public BasWorkgroupEmployee(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:班组ID,BAS_GROUP.ID - /// Default: - /// Nullable:False - /// - public string group_id {get;set;} = string.Empty; - - /// - /// Desc:班组代码 - /// Default: - /// Nullable:False - /// - public string group_code {get;set;} = string.Empty; - - /// - /// Desc:人员ID,BAS_EMPLOYEE.ID - /// Default: - /// Nullable:False - /// - public string employee_id {get;set;} = string.Empty; - - /// - /// Desc:人员代码 - /// Default: - /// Nullable:False - /// - public string employee_code {get;set;} = string.Empty; - - /// - /// Desc:是否班组长 - /// Default: - /// Nullable:True - /// - public int? is_leader {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 班组ID,BAS_GROUP.ID + /// + public string group_id { get; set; } = string.Empty; + + /// + /// 班组代码 + /// + public string group_code { get; set; } = string.Empty; + + /// + /// 人员ID,BAS_EMPLOYEE.ID + /// + public string employee_id { get; set; } = string.Empty; + + /// + /// 人员代码 + /// + public string employee_code { get; set; } = string.Empty; + + /// + /// 是否班组长 + /// + public int? is_leader { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupWorkcenter.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupWorkcenter.cs index 6783668b..3a71cf5a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupWorkcenter.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupWorkcenter.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 班组与工作中心关系 +/// +[SugarTable("bas_workgroup_workcenter")] +public partial class BasWorkgroupWorkcenter : BaseEntity { - /// - ///班组与工作中心关系 - /// - [SugarTable("bas_workgroup_workcenter")] - public partial class BasWorkgroupWorkcenter + public BasWorkgroupWorkcenter() { - public BasWorkgroupWorkcenter(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:班组ID,BAS_GROUP.ID - /// Default: - /// Nullable:False - /// - public string group_id {get;set;} = string.Empty; - - /// - /// Desc:班组代码 - /// Default: - /// Nullable:False - /// - public string group_code {get;set;} = string.Empty; - - /// - /// Desc:工作中心ID,BAS_WORKCENTER.ID - /// Default: - /// Nullable:False - /// - public string workcenter_id {get;set;} = string.Empty; - - /// - /// Desc:工作中心代码 - /// Default: - /// Nullable:False - /// - public string workcenter_code {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 班组ID,BAS_GROUP.ID + /// + public string group_id { get; set; } = string.Empty; + + /// + /// 班组代码 + /// + public string group_code { get; set; } = string.Empty; + + /// + /// 工作中心ID,BAS_WORKCENTER.ID + /// + public string workcenter_id { get; set; } = string.Empty; + + /// + /// 工作中心代码 + /// + public string workcenter_code { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkline.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkline.cs index 9e055c38..8c04704a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkline.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkline.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 生产线资料 +/// +[SugarTable("bas_workline")] +public partial class BasWorkline : BaseEntity { - /// - ///生产线资料 - /// - [SugarTable("bas_workline")] - public partial class BasWorkline + public BasWorkline() { - public BasWorkline(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产线代码 - /// Default: - /// Nullable:False - /// - public string workline_code {get;set;} = string.Empty; - - /// - /// Desc:产线名称 - /// Default: - /// Nullable:False - /// - public string workline_name {get;set;} = string.Empty; - - /// - /// Desc:所属工段ID，BAS_SEGMENT.ID - /// Default: - /// Nullable:False - /// - public string segment_id {get;set;} = string.Empty; - - /// - /// Desc:所属工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:班制代码ID，BAS_SHIFTTYPE.ID - /// Default: - /// Nullable:False - /// - public string shifttype_id {get;set;} = string.Empty; - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shifttype_code {get;set;} = string.Empty; - - /// - /// Desc:所属工厂ID，BAS_FACTORY.ID - /// Default: - /// Nullable:False - /// - public string factory_id {get;set;} = string.Empty; - - /// - /// Desc:所属工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产线代码 + /// + public string workline_code { get; set; } = string.Empty; + + /// + /// 产线名称 + /// + public string workline_name { get; set; } = string.Empty; + + /// + /// 所属工段ID，BAS_SEGMENT.ID + /// + public string segment_id { get; set; } = string.Empty; + + /// + /// 所属工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 班制代码ID，BAS_SHIFTTYPE.ID + /// + public string shifttype_id { get; set; } = string.Empty; + + /// + /// 班制代码 + /// + public string shifttype_code { get; set; } = string.Empty; + + /// + /// 所属工厂ID，BAS_FACTORY.ID + /// + public string factory_id { get; set; } = string.Empty; + + /// + /// 所属工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorksegment.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorksegment.cs index 6a3294de..a0875991 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorksegment.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorksegment.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工段资料 +/// +[SugarTable("bas_worksegment")] +public partial class BasWorksegment : BaseEntity { - /// - ///工段资料 - /// - [SugarTable("bas_worksegment")] - public partial class BasWorksegment + public BasWorksegment() { - public BasWorksegment(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:工段名称 - /// Default: - /// Nullable:False - /// - public string segment_name {get;set;} = string.Empty; - - /// - /// Desc:所属班制ID，BAS_SHIFTTYPE.ID - /// Default: - /// Nullable:False - /// - public string shifttype_id {get;set;} = string.Empty; - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shifttype_code {get;set;} = string.Empty; - - /// - /// Desc:所属工厂ID - /// Default: - /// Nullable:False - /// - public string factory_id {get;set;} = string.Empty; - - /// - /// Desc:所属工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 工段名称 + /// + public string segment_name { get; set; } = string.Empty; + + /// + /// 所属班制ID，BAS_SHIFTTYPE.ID + /// + public string shifttype_id { get; set; } = string.Empty; + + /// + /// 班制代码 + /// + public string shifttype_code { get; set; } = string.Empty; + + /// + /// 所属工厂ID + /// + public string factory_id { get; set; } = string.Empty; + + /// + /// 所属工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkstation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkstation.cs index 324cf814..b0e0e634 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasWorkstation.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasWorkstation.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.BasicData.Entities +namespace Tnb.BasicData.Entities; + +/// +/// 工位资料 +/// +[SugarTable("bas_workstation")] +public partial class BasWorkstation : BaseEntity { - /// - ///工位资料 - /// - [SugarTable("bas_workstation")] - public partial class BasWorkstation + public BasWorkstation() { - public BasWorkstation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:工位名称 - /// Default: - /// Nullable:False - /// - public string station_name {get;set;} = string.Empty; - - /// - /// Desc:工位类别 1:人Human, 2:设备Machine - /// Default: - /// Nullable:False - /// - public int station_type {get;set;} - - /// - /// Desc:所属工段ID，BAS_SEGMENT.ID - /// Default: - /// Nullable:False - /// - public string segment_id {get;set;} = string.Empty; - - /// - /// Desc:所属工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:所属产线ID，BAS_PRODUCTIONLINE.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? productionline_id {get;set;} - - /// - /// Desc:所属产线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? productionline_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 工位名称 + /// + public string station_name { get; set; } = string.Empty; + + /// + /// 工位类别 1:人Human, 2:设备Machine + /// + public int station_type { get; set; } + + /// + /// 所属工段ID，BAS_SEGMENT.ID + /// + public string segment_id { get; set; } = string.Empty; + + /// + /// 所属工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 所属产线ID，BAS_PRODUCTIONLINE.ID + /// + public string? productionline_id { get; set; } + + /// + /// 所属产线代码 + /// + public string? productionline_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs index 6a42d2b8..20179695 100644 --- a/BasicData/Tnb.BasicData/BasMaterialService.cs +++ b/BasicData/Tnb.BasicData/BasMaterialService.cs @@ -84,25 +84,47 @@ namespace Tnb.BasicData public async Task GetMaterialSelectInfo(MaterialSelectQueryInput queryInput) { var db = _repository.AsSugarClient(); - List ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0); - BasEbomH ebom = await db.Queryable().Where(x => x.id == queryInput.ebom_id).SingleAsync(); - ids.Add(ebom.material_id); - var result = await db.Queryable() - .LeftJoin((a, b) => a.unit_id == b.EnCode) - .LeftJoin((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null) - .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info)) - .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id)) - .Select((a, b, c) => new MaterialSelectOutput() - { - id = a.id, - code = a.code, - name = a.name, - descrip = a.descrip, - unit_id = a.unit_id, - unit_name = b.FullName, - }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize); + if (!string.IsNullOrEmpty(queryInput.ebom_id)) + { + List ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0); + BasEbomH ebom = await db.Queryable().Where(x => x.id == queryInput.ebom_id).SingleAsync(); + ids.Add(ebom.material_id); + var result = await db.Queryable() + .LeftJoin((a, b) => a.unit_id == b.EnCode) + .LeftJoin((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null) + .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info)) + .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id)) + .Select((a, b, c) => new MaterialSelectOutput() + { + id = a.id, + code = a.code, + name = a.name, + descrip = a.descrip, + unit_id = a.unit_id, + unit_name = b.FullName, + }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize); - return PageResult.SqlSugarPageResult(result); + return PageResult.SqlSugarPageResult(result); + + } + else + { + var result = await db.Queryable() + .LeftJoin((a, b) => a.unit_id == b.EnCode) + .LeftJoin((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null) + .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info)) + .Select((a, b, c) => new MaterialSelectOutput() + { + id = a.id, + code = a.code, + name = a.name, + descrip = a.descrip, + unit_id = a.unit_id, + unit_name = b.FullName, + }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize); + + return PageResult.SqlSugarPageResult(result); + } } /// diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs new file mode 100644 index 00000000..469c7b10 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs @@ -0,0 +1,15 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class SpotInsRecordExecuteInput + { + public string id { get; set; } + + public string attachment { get; set; } + + public string result { get; set; } + + public string result_remark { get; set; } + + public List> details { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs new file mode 100644 index 00000000..ce77eef0 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs @@ -0,0 +1,11 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class SpotInsRecordRepeatInput + { + public string id { get; set; } + + public string repeat_result { get; set; } + + public string repeat_remark { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs new file mode 100644 index 00000000..58ed6d64 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs @@ -0,0 +1,9 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class SpotInsRecordRepeatOutput + { + public EqpSpotInsRecordH model { get; set; } + + public List details { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/BasMaterial.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/BasMaterial.cs deleted file mode 100644 index 5e2a0e26..00000000 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/BasMaterial.cs +++ /dev/null @@ -1,352 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SqlSugar; -using Tnb.Common.Contracts; - -namespace Tnb.EquipMgr.Entities.Entity -{ - /// - ///物料信息 - /// - [SugarTable("bas_material")] - public partial class BasMaterial : BaseEntity - { - public BasMaterial() - { - - - } - /// - /// Desc:是否包含入库数 - /// Default: - /// Nullable:True - /// - public int? is_contain_into_num { get; set; } - - /// - /// Desc:批次管理 - /// Default: - /// Nullable:True - /// - public int? is_batch_enabled { get; set; } - - /// - /// Desc:标签管理 - /// Default: - /// Nullable:True - /// - public int? is_label_enabled { get; set; } - - /// - /// Desc:附件 - /// Default:NULL::character varying - /// Nullable:True - /// - public string attachment { get; set; } - - /// - /// Desc:先进先出 0否 1是 - /// Default: - /// Nullable:True - /// - public int? first_in_out { get; set; } - - /// - /// Desc:存储有效期(天) - /// Default: - /// Nullable:True - /// - public int? storage_valid_day { get; set; } - - /// - /// Desc:预警提前期(天) - /// Default: - /// Nullable:True - /// - public int? early_warn_day { get; set; } - - /// - /// Desc:安全库存 - /// Default: - /// Nullable:True - /// - public int? safe_stock { get; set; } - - /// - /// Desc:发料仓库id - /// Default: - /// Nullable:True - /// - public string send_warehouse_id { get; set; } - - /// - /// Desc:入厂单位id - /// Default: - /// Nullable:True - /// - public string into_factory_unit_id { get; set; } - - /// - /// Desc:安全库存包含状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string safe_stock_stauts { get; set; } - - /// - /// Desc:投料单位 - /// Default: - /// Nullable:True - /// - public string material_in_unit_id { get; set; } - - /// - /// Desc:产出单位 - /// Default: - /// Nullable:True - /// - public string material_out_unit_id { get; set; } - - /// - /// Desc:请料方式 1按计划排程请料 2自行管控 - /// Default: - /// Nullable:True - /// - public string material_request_method { get; set; } - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string code { get; set; } - - /// - /// Desc:物料名称 - /// Default: - /// Nullable:False - /// - public string name { get; set; } - - /// - /// Desc:物料分类ID - /// Default: - /// Nullable:False - /// - public string category_id { get; set; } - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id { get; set; } - - /// - /// Desc:单价 - /// Default: - /// Nullable:True - /// - public decimal? cost { get; set; } - - /// - /// Desc:毛重 - /// Default: - /// Nullable:True - /// - public decimal? grossweight { get; set; } - - /// - /// Desc:净重 - /// Default: - /// Nullable:True - /// - public decimal? netweight { get; set; } - - /// - /// Desc:长 - /// Default: - /// Nullable:True - /// - public decimal? length { get; set; } - - /// - /// Desc:宽 - /// Default: - /// Nullable:True - /// - public decimal? width { get; set; } - - /// - /// Desc:高 - /// Default: - /// Nullable:True - /// - public decimal? high { get; set; } - - /// - /// Desc:体积 - /// Default: - /// Nullable:True - /// - public decimal? volumn { get; set; } - - /// - /// Desc:是否免检 - /// Default: - /// Nullable:True - /// - public int? isexemption { get; set; } - - /// - /// Desc:安全库存 - /// Default: - /// Nullable:True - /// - public decimal? safeqty { get; set; } - - /// - /// Desc:保质期 - /// Default: - /// Nullable:True - /// - public int? qualityperiod { get; set; } - - /// - /// Desc:最小包装 - /// Default: - /// Nullable:True - /// - public decimal? minpacking { get; set; } - - /// - /// Desc:先进先出间隔天数，批次间隔天数 - /// Default: - /// Nullable:True - /// - public int? fifo_interval_days { get; set; } - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time { get; set; } - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time { get; set; } - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string extras { get; set; } - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string org_id { get; set; } - - /// - /// Desc:是否过期允许出库 - /// Default:NULL::character varying - /// Nullable:True - /// - public string expireout { get; set; } - - /// - /// Desc:是否先进先出管控 - /// Default:NULL::character varying - /// Nullable:True - /// - public string fifo { get; set; } - - /// - /// Desc:物料规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string material_standard { get; set; } - - /// - /// Desc:海关编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string fhscode { get; set; } - - /// - /// Desc:附属性 - /// Default:NULL::character varying - /// Nullable:True - /// - public string attribute { get; set; } - - /// - /// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl - /// Default:NULL::character varying - /// Nullable:True - /// - public string controltype { get; set; } - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string remark { get; set; } - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string create_id { get; set; } - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string modify_id { get; set; } - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string state { get; set; } - - /// - /// Desc:物料属性 - /// Default:NULL::character varying - /// Nullable:True - /// - public string material_property { get; set; } - - /// - /// Desc:标签 - /// Default:NULL::character varying - /// Nullable:True - /// - public string label { get; set; } - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string descrip { get; set; } - - } -} diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/BasProduct.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/BasProduct.cs deleted file mode 100644 index d6ff9f62..00000000 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/BasProduct.cs +++ /dev/null @@ -1,128 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SqlSugar; -using Tnb.Common.Contracts; - -namespace Tnb.EquipMgr.Entities.Entity -{ /// - ///产品信息 - /// - [SugarTable("bas_product")] - public partial class BasProduct : BaseEntity - { - public BasProduct() - { - - - } - - /// - /// Desc:产品分类ID - /// Default: - /// Nullable:False - /// - public string categoryid { get; set; } - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:True - /// - public decimal? relation_ratio { get; set; } - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time { get; set; } - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time { get; set; } - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string extras { get; set; } - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string org_id { get; set; } - - /// - /// Desc:产品规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string product_standard { get; set; } - - /// - /// Desc:产品类型： 半成品：SemiManufacture 成品：FinishedProduct - /// Default:NULL::character varying - /// Nullable:True - /// - public string product_type { get; set; } - - /// - /// Desc:物料ID，BAS_MATERIAL.ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string material_id { get; set; } - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string remark { get; set; } - - /// - /// Desc:时间戳(用于并发控制) - /// Default:NULL::character varying - /// Nullable:True - /// - public string timestamp { get; set; } - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string create_id { get; set; } - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string modify_id { get; set; } - - /// - /// Desc:产品名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string product_name { get; set; } - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string product_code { get; set; } - - } -} diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpArea.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpArea.cs index d39da9d8..4d9bd9c1 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpArea.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpArea.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_area")] +public partial class EqpArea : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_area")] - public partial class EqpArea + public EqpArea() { - public EqpArea(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? area_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? area_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? icon {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? area_name { get; set; } + + /// + /// TODO + /// + public string? area_code { get; set; } + + /// + /// TODO + /// + public string? parent_id { get; set; } + + /// + /// TODO + /// + public string? icon { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpAreaEquip.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpAreaEquip.cs index f790fd07..b2f786aa 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpAreaEquip.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpAreaEquip.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_area_equip")] +public partial class EqpAreaEquip : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_area_equip")] - public partial class EqpAreaEquip + public EqpAreaEquip() { - public EqpAreaEquip(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? area_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? area_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipAcceptRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipAcceptRecord.cs index a4f07108..e9603c1d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipAcceptRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipAcceptRecord.cs @@ -1,329 +1,232 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_accept_record")] +public partial class EqpEquipAcceptRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_accept_record")] - public partial class EqpEquipAcceptRecord + public EqpEquipAcceptRecord() { - public EqpEquipAcceptRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public float? num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? delivery_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? arrival_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? supplier_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? other_remarks {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? quality_inspection {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? quality_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? quality_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? inspection_opinion {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manage_charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accept_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? manage_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_opinion {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? detect_users {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public float? num { get; set; } + + /// + /// TODO + /// + public string? manufactor { get; set; } + + /// + /// TODO + /// + public DateTime? delivery_date { get; set; } + + /// + /// TODO + /// + public DateTime? arrival_date { get; set; } + + /// + /// TODO + /// + public string? supplier_name { get; set; } + + /// + /// TODO + /// + public string? manufactor_code { get; set; } + + /// + /// TODO + /// + public string? other_remarks { get; set; } + + /// + /// TODO + /// + public string? quality_inspection { get; set; } + + /// + /// TODO + /// + public string? quality_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? quality_time { get; set; } + + /// + /// TODO + /// + public string? inspection_opinion { get; set; } + + /// + /// TODO + /// + public string? manage_charge_user_id { get; set; } + + /// + /// TODO + /// + public string? accept_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? manage_time { get; set; } + + /// + /// TODO + /// + public string? check_opinion { get; set; } + + /// + /// TODO + /// + public string? check_charge_user_id { get; set; } + + /// + /// TODO + /// + public string? check_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? use_date { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? detect_users { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfo.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfo.cs index 7a1a2613..a33e2c62 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfo.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfo.cs @@ -1,483 +1,342 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info")] +public partial class EqpEquipInfo : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info")] - public partial class EqpEquipInfo + public EqpEquipInfo() { - public EqpEquipInfo(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? purchase_order_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? manufactor_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_company_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? supplier_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manage_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? acceptance_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? install_data {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? skill_change_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_set {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? trace_mode {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? dcs_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? bar_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_scrap {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? parameter {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? trace_circle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? trace_circle_type {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? classification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? assets_encode {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? keeper_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? delivery_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_files {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_tag {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? flow {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lift {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? power {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pressure {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? speed {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? stop_time_end {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? stop_time_start {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? volume {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? stop_remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rfid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? spot_type {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? purchase_order_code { get; set; } + + /// + /// TODO + /// + public string? manufactor { get; set; } + + /// + /// TODO + /// + public string? manufactor_code { get; set; } + + /// + /// TODO + /// + public DateTime? manufactor_date { get; set; } + + /// + /// TODO + /// + public string? maintenance_company_id { get; set; } + + /// + /// TODO + /// + public string? maintenance_tel { get; set; } + + /// + /// TODO + /// + public string? supplier_id { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public string? manage_department_id { get; set; } + + /// + /// TODO + /// + public string? use_department_id { get; set; } + + /// + /// TODO + /// + public DateTime? acceptance_date { get; set; } + + /// + /// TODO + /// + public DateTime? install_data { get; set; } + + /// + /// TODO + /// + public DateTime? use_date { get; set; } + + /// + /// TODO + /// + public string? skill_change_code { get; set; } + + /// + /// TODO + /// + public int is_set { get; set; } + + /// + /// TODO + /// + public int? trace_mode { get; set; } + + /// + /// TODO + /// + public string? dcs_id { get; set; } + + /// + /// TODO + /// + public string? bar_code { get; set; } + + /// + /// TODO + /// + public int is_scrap { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? parameter { get; set; } + + /// + /// TODO + /// + public int? trace_circle { get; set; } + + /// + /// TODO + /// + public int? trace_circle_type { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? classification { get; set; } + + /// + /// TODO + /// + public string? assets_encode { get; set; } + + /// + /// TODO + /// + public string? section_id { get; set; } + + /// + /// TODO + /// + public string? keeper_id { get; set; } + + /// + /// TODO + /// + public DateTime? delivery_date { get; set; } + + /// + /// TODO + /// + public string? equip_files { get; set; } + + /// + /// TODO + /// + public string? equip_tag { get; set; } + + /// + /// TODO + /// + public string? flow { get; set; } + + /// + /// TODO + /// + public string? lift { get; set; } + + /// + /// TODO + /// + public string? power { get; set; } + + /// + /// TODO + /// + public string? pressure { get; set; } + + /// + /// TODO + /// + public string? speed { get; set; } + + /// + /// TODO + /// + public DateTime? stop_time_end { get; set; } + + /// + /// TODO + /// + public DateTime? stop_time_start { get; set; } + + /// + /// TODO + /// + public string? volume { get; set; } + + /// + /// TODO + /// + public string? stop_remark { get; set; } + + /// + /// TODO + /// + public string? rfid { get; set; } + + /// + /// TODO + /// + public int? spot_type { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDetail.cs index 2670e415..e3fb7973 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDetail.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_detail")] +public partial class EqpEquipInfoDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_detail")] - public partial class EqpEquipInfoDetail + public EqpEquipInfoDetail() { - public EqpEquipInfoDetail(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? tag {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_delete {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? tag { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// TODO + /// + public int is_delete { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDocument.cs index 0fb7e5d7..678d631d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoDocument.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_document")] +public partial class EqpEquipInfoDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_document")] - public partial class EqpEquipInfoDocument + public EqpEquipInfoDocument() { - public EqpEquipInfoDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoKeyPara.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoKeyPara.cs index 645089a1..ed2f8023 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoKeyPara.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoKeyPara.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_key_para")] +public partial class EqpEquipInfoKeyPara : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_key_para")] - public partial class EqpEquipInfoKeyPara + public EqpEquipInfoKeyPara() { - public EqpEquipInfoKeyPara(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? key_para_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? key_para_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? key_para_name { get; set; } + + /// + /// TODO + /// + public string? key_para_code { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrap.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrap.cs index bbbd6c15..12fda915 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrap.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrap.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_scrap")] +public partial class EqpEquipInfoScrap : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_scrap")] - public partial class EqpEquipInfoScrap + public EqpEquipInfoScrap() { - public EqpEquipInfoScrap(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? scrap_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime scrap_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? scrap_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? scrap_tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? scrap_code { get; set; } + + /// + /// TODO + /// + public DateTime scrap_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? scrap_user_id { get; set; } + + /// + /// TODO + /// + public string? scrap_tel { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrapDoc.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrapDoc.cs index 33b963bd..17f81d48 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrapDoc.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoScrapDoc.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_scrap_doc")] +public partial class EqpEquipInfoScrapDoc : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_scrap_doc")] - public partial class EqpEquipInfoScrapDoc + public EqpEquipInfoScrapDoc() { - public EqpEquipInfoScrapDoc(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_info_scrap_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_info_scrap_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSpareParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSpareParts.cs index 1b4f66e2..97ca292c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSpareParts.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSpareParts.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_spare_parts")] +public partial class EqpEquipInfoSpareParts : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_spare_parts")] - public partial class EqpEquipInfoSpareParts + public EqpEquipInfoSpareParts() { - public EqpEquipInfoSpareParts(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spare_parts_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public float? unit_areas {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? spare_parts_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public float? unit_areas { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoStatusLog.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoStatusLog.cs index 3a383304..4d57be79 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoStatusLog.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoStatusLog.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_status_log")] +public partial class EqpEquipInfoStatusLog : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_status_log")] - public partial class EqpEquipInfoStatusLog + public EqpEquipInfoStatusLog() { - public EqpEquipInfoStatusLog(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? before_status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? after_status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? before_status { get; set; } + + /// + /// TODO + /// + public string? after_status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSubEquip.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSubEquip.cs index 6a63f313..f781ac63 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSubEquip.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoSubEquip.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_sub_equip")] +public partial class EqpEquipInfoSubEquip : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_sub_equip")] - public partial class EqpEquipInfoSubEquip + public EqpEquipInfoSubEquip() { - public EqpEquipInfoSubEquip(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? sub_equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? sub_equip_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTags.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTags.cs index 1d3ed611..3fc01f6a 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTags.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTags.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_tags")] +public partial class EqpEquipInfoTags : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_tags")] - public partial class EqpEquipInfoTags + public EqpEquipInfoTags() { - public EqpEquipInfoTags(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? tag {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? tag { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTest.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTest.cs index f69341fb..49931414 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTest.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipInfoTest.cs @@ -1,181 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_info_test")] +public partial class EqpEquipInfoTest : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_info_test")] - public partial class EqpEquipInfoTest + public EqpEquipInfoTest() { - public EqpEquipInfoTest(){ - - - } - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? purchase_order_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? assets_encode {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? manufactor_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? supplier_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_company_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manage_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? acceptance_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? install_data {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? skill_change_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? dcs_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? parameter {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public string? use_department_id { get; set; } + + /// + /// TODO + /// + public string? purchase_order_code { get; set; } + + /// + /// TODO + /// + public string? manufactor { get; set; } + + /// + /// TODO + /// + public string? manufactor_code { get; set; } + + /// + /// TODO + /// + public string? assets_encode { get; set; } + + /// + /// TODO + /// + public DateTime? manufactor_date { get; set; } + + /// + /// TODO + /// + public string? supplier_id { get; set; } + + /// + /// TODO + /// + public string? maintenance_company_id { get; set; } + + /// + /// TODO + /// + public string? maintenance_tel { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public string? manage_department_id { get; set; } + + /// + /// TODO + /// + public DateTime? acceptance_date { get; set; } + + /// + /// TODO + /// + public DateTime? install_data { get; set; } + + /// + /// TODO + /// + public DateTime? use_date { get; set; } + + /// + /// TODO + /// + public string? skill_change_code { get; set; } + + /// + /// TODO + /// + public string? dcs_id { get; set; } + + /// + /// TODO + /// + public string? parameter { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipRegistration.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipRegistration.cs index b77430ac..2f3a041f 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipRegistration.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipRegistration.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_registration")] +public partial class EqpEquipRegistration : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_registration")] - public partial class EqpEquipRegistration + public EqpEquipRegistration() { - public EqpEquipRegistration(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_end_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? before_status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? after_status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? users_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public DateTime? use_start_time { get; set; } + + /// + /// TODO + /// + public DateTime? use_end_time { get; set; } + + /// + /// TODO + /// + public int? before_status { get; set; } + + /// + /// TODO + /// + public int? after_status { get; set; } + + /// + /// TODO + /// + public string? users_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTag.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTag.cs index 93e7ee65..e798600d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTag.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTag.cs @@ -1,259 +1,182 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_tag")] +public partial class EqpEquipTag : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_tag")] - public partial class EqpEquipTag + public EqpEquipTag() { - public EqpEquipTag(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? source_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? tag {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? tag_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? data_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public decimal standard_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? param_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public float? factor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? frequency {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? run_status {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? source_name { get; set; } + + /// + /// TODO + /// + public string? tag { get; set; } + + /// + /// TODO + /// + public string? tag_name { get; set; } + + /// + /// TODO + /// + public int? data_type { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public decimal standard_value { get; set; } + + /// + /// TODO + /// + public string? value { get; set; } + + /// + /// TODO + /// + public string? param_value { get; set; } + + /// + /// TODO + /// + public float? factor { get; set; } + + /// + /// TODO + /// + public int? frequency { get; set; } + + /// + /// TODO + /// + public string? source_id { get; set; } + + /// + /// TODO + /// + public int? run_status { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTagsPrintRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTagsPrintRecord.cs index 0d19648a..6a9c98c7 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTagsPrintRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTagsPrintRecord.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_tags_print_record")] +public partial class EqpEquipTagsPrintRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_tags_print_record")] - public partial class EqpEquipTagsPrintRecord + public EqpEquipTagsPrintRecord() { - public EqpEquipTagsPrintRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime print_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? print_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public DateTime print_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? print_user { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecord.cs index f93ec1a0..1f71e947 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecord.cs @@ -1,280 +1,197 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_trace_record")] +public partial class EqpEquipTraceRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_trace_record")] - public partial class EqpEquipTraceRecord + public EqpEquipTraceRecord() { - public EqpEquipTraceRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int run_mode {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime run_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? run_org {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int check_org_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_org_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? licence_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? match_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? technical {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? verdict_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? confirm_date {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public int run_mode { get; set; } + + /// + /// TODO + /// + public DateTime run_date { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? run_org { get; set; } + + /// + /// TODO + /// + public int check_org_type { get; set; } + + /// + /// TODO + /// + public string? check_org_name { get; set; } + + /// + /// TODO + /// + public string? licence_code { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int? is_include { get; set; } + + /// + /// TODO + /// + public int? match_result { get; set; } + + /// + /// TODO + /// + public string? technical { get; set; } + + /// + /// TODO + /// + public string? verdict_result { get; set; } + + /// + /// TODO + /// + public DateTime? confirm_date { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordDoc.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordDoc.cs index 8ff1ebd0..05a99a58 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordDoc.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordDoc.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_trace_record_doc")] +public partial class EqpEquipTraceRecordDoc : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_trace_record_doc")] - public partial class EqpEquipTraceRecordDoc + public EqpEquipTraceRecordDoc() { - public EqpEquipTraceRecordDoc(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_trace_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_delete {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// TODO + /// + public string? equip_trace_record_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// TODO + /// + public int is_delete { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordItem.cs index 6baa9ce7..d1362539 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceRecordItem.cs @@ -1,266 +1,187 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_trace_record_item")] +public partial class EqpEquipTraceRecordItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_trace_record_item")] - public partial class EqpEquipTraceRecordItem + public EqpEquipTraceRecordItem() { - public EqpEquipTraceRecordItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_trace_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_trace_std_data_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? item_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_std_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_results {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? technical_requir {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_trace_record_id { get; set; } + + /// + /// TODO + /// + public string? equip_trace_std_data_item_id { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public string? item_describe { get; set; } + + /// + /// TODO + /// + public string? item_result { get; set; } + + /// + /// TODO + /// + public string? item_unit { get; set; } + + /// + /// TODO + /// + public int? item_type { get; set; } + + /// + /// TODO + /// + public string? item_std_value { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? item_results { get; set; } + + /// + /// TODO + /// + public int? is_include { get; set; } + + /// + /// TODO + /// + public string? technical_requir { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdData.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdData.cs index 4703de20..f5a98867 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdData.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdData.cs @@ -1,231 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_trace_std_data")] +public partial class EqpEquipTraceStdData : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_trace_std_data")] - public partial class EqpEquipTraceStdData + public EqpEquipTraceStdData() { - public EqpEquipTraceStdData(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? adjust_supplier_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_supplier_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int adjust_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? confirm_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accuracy {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? measuring_range {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? plan_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? adjust_supplier_name { get; set; } + + /// + /// TODO + /// + public string? check_supplier_name { get; set; } + + /// + /// TODO + /// + public int adjust_type { get; set; } + + /// + /// TODO + /// + public int? confirm_type { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? accuracy { get; set; } + + /// + /// TODO + /// + public string? measuring_range { get; set; } + + /// + /// TODO + /// + public DateTime? plan_time { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDataItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDataItem.cs index 321549f8..52fefbc1 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDataItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDataItem.cs @@ -1,231 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_trace_std_data_item")] +public partial class EqpEquipTraceStdDataItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_trace_std_data_item")] - public partial class EqpEquipTraceStdDataItem + public EqpEquipTraceStdDataItem() { - public EqpEquipTraceStdDataItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_trace_std_data_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int item_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_std_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_trace_std_data_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public string? item_describe { get; set; } + + /// + /// TODO + /// + public string? item_result { get; set; } + + /// + /// TODO + /// + public string? item_unit { get; set; } + + /// + /// TODO + /// + public int item_type { get; set; } + + /// + /// TODO + /// + public string? item_std_value { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDoc.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDoc.cs index f8e63ca7..ab51feb9 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDoc.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTraceStdDoc.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_trace_std_doc")] +public partial class EqpEquipTraceStdDoc : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_trace_std_doc")] - public partial class EqpEquipTraceStdDoc + public EqpEquipTraceStdDoc() { - public EqpEquipTraceStdDoc(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_trace_sta_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + + /// + /// TODO + /// + public string? equip_trace_sta_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipType.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipType.cs index cb7e6196..143d2bdd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipType.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipType.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备类型 +/// +[SugarTable("eqp_equip_type")] +public partial class EqpEquipType : BaseEntity { - /// - ///设备类型 - /// - [SugarTable("eqp_equip_type")] - public partial class EqpEquipType + public EqpEquipType() { - public EqpEquipType(){ - - - } - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:名称 - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:编码 - /// Default: - /// Nullable:False - /// - public string code {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:是否是特种设备0否1是 - /// Default: - /// Nullable:False - /// - public int is_special_equipment {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:状态0 禁用 1 启用 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:是否是实验设备0否1是 - /// Default: - /// Nullable:False - /// - public int is_lab {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 编码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 是否是特种设备0否1是 + /// + public int is_special_equipment { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 状态0 禁用 1 启用 + /// + public int status { get; set; } + + /// + /// 是否是实验设备0否1是 + /// + public int is_lab { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckMode.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckMode.cs index 9d6baf47..ecc73633 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckMode.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckMode.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_type_check_mode")] +public partial class EqpEquipTypeCheckMode : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_type_check_mode")] - public partial class EqpEquipTypeCheckMode + public EqpEquipTypeCheckMode() { - public EqpEquipTypeCheckMode(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? mode_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? mode_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int mode_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int confirm_type {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? mode_code { get; set; } + + /// + /// TODO + /// + public string? mode_name { get; set; } + + /// + /// TODO + /// + public int mode_type { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public int confirm_type { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckModeItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckModeItem.cs index ce45889f..dbb82d0a 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckModeItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeCheckModeItem.cs @@ -1,245 +1,172 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_type_check_mode_item")] +public partial class EqpEquipTypeCheckModeItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_type_check_mode_item")] - public partial class EqpEquipTypeCheckModeItem + public EqpEquipTypeCheckModeItem() { - public EqpEquipTypeCheckModeItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_chcek_mode_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int item_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_std_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_chcek_mode_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_name { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public string? item_describe { get; set; } + + /// + /// TODO + /// + public string? item_result { get; set; } + + /// + /// TODO + /// + public string? item_unit { get; set; } + + /// + /// TODO + /// + public int item_type { get; set; } + + /// + /// TODO + /// + public string? item_std_value { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeFile.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeFile.cs index 2aadc5da..d1e4ffb8 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeFile.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipTypeFile.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_type_file")] +public partial class EqpEquipTypeFile : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_type_file")] - public partial class EqpEquipTypeFile + public EqpEquipTypeFile() { - public EqpEquipTypeFile(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgrade.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgrade.cs index 541ce236..c13a962e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgrade.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgrade.cs @@ -1,308 +1,217 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_upgrade")] +public partial class EqpEquipUpgrade : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_upgrade")] - public partial class EqpEquipUpgrade + public EqpEquipUpgrade() { - public EqpEquipUpgrade(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? upgrade_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? upgrade_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime end_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? estimate_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? finish_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? upgrade_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? finish_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_delay {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? benefit_confirm {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_close {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? record_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? branch_leader_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? purpose {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? branch_org_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_before_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_end_send {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? upgrade_name { get; set; } + + /// + /// TODO + /// + public string? upgrade_code { get; set; } + + /// + /// TODO + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public DateTime end_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? content { get; set; } + + /// + /// TODO + /// + public double? estimate_cost { get; set; } + + /// + /// TODO + /// + public DateTime? finish_date { get; set; } + + /// + /// TODO + /// + public double? upgrade_cost { get; set; } + + /// + /// TODO + /// + public string? finish_describe { get; set; } + + /// + /// TODO + /// + public int is_delay { get; set; } + + /// + /// TODO + /// + public string? benefit_confirm { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int is_close { get; set; } + + /// + /// TODO + /// + public DateTime? record_date { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? branch_leader_id { get; set; } + + /// + /// TODO + /// + public string? charge_id { get; set; } + + /// + /// TODO + /// + public string? purpose { get; set; } + + /// + /// TODO + /// + public string? branch_org_id { get; set; } + + /// + /// TODO + /// + public int? is_before_send { get; set; } + + /// + /// TODO + /// + public int? is_end_send { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDelay.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDelay.cs index 7a3766dc..415961d1 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDelay.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDelay.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_upgrade_delay")] +public partial class EqpEquipUpgradeDelay : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_upgrade_delay")] - public partial class EqpEquipUpgradeDelay + public EqpEquipUpgradeDelay() { - public EqpEquipUpgradeDelay(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_upgrade_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime before_delay_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime after_delay_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? delay_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_upgrade_id { get; set; } + + /// + /// TODO + /// + public DateTime before_delay_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public DateTime after_delay_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? delay_reason { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDocument.cs index 6512accb..f74dbdaf 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeDocument.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_upgrade_document")] +public partial class EqpEquipUpgradeDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_upgrade_document")] - public partial class EqpEquipUpgradeDocument + public EqpEquipUpgradeDocument() { - public EqpEquipUpgradeDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_upgrade_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? from_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_upgrade_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? from_type { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeRecord.cs index 901e8ec2..450f83f3 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeRecord.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_upgrade_record")] +public partial class EqpEquipUpgradeRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_upgrade_record")] - public partial class EqpEquipUpgradeRecord + public EqpEquipUpgradeRecord() { - public EqpEquipUpgradeRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_upgrade_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? questions {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? schedule {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? actual_cost {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_upgrade_id { get; set; } + + /// + /// TODO + /// + public DateTime record_date_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? content { get; set; } + + /// + /// TODO + /// + public string? questions { get; set; } + + /// + /// TODO + /// + public string? schedule { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public double? actual_cost { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeUsers.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeUsers.cs index 74bf9a64..ada12e2a 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeUsers.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipUpgradeUsers.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_equip_upgrade_users")] +public partial class EqpEquipUpgradeUsers : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_equip_upgrade_users")] - public partial class EqpEquipUpgradeUsers + public EqpEquipUpgradeUsers() { - public EqpEquipUpgradeUsers(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_upgrade_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? members_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_charge {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_upgrade_id { get; set; } + + /// + /// TODO + /// + public string? members_id { get; set; } + + /// + /// TODO + /// + public int is_charge { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs index 94dc726d..fe52805e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs @@ -1,266 +1,187 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备登记 +/// +[SugarTable("eqp_equipment")] +public partial class EqpEquipment : BaseEntity { - /// - ///设备登记 - /// - [SugarTable("eqp_equipment")] - public partial class EqpEquipment + public EqpEquipment() { - public EqpEquipment(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:设备代码 - /// Default: - /// Nullable:False - /// - public string code {get;set;} = string.Empty; - - /// - /// Desc:设备名称 - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:设备类型id - /// Default: - /// Nullable:False - /// - public string equip_type_id {get;set;} = string.Empty; - - /// - /// Desc:设备生产日期 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? product_date {get;set;} - - /// - /// Desc:设备生产厂家 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? manufacturer {get;set;} - - /// - /// Desc:使用部门id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:安装日期 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? install_date {get;set;} - - /// - /// Desc:使用日期 - /// Default: - /// Nullable:True - /// - public DateTime? use_date {get;set;} - - /// - /// Desc:验收日期 - /// Default: - /// Nullable:True - /// - public DateTime? accept_date {get;set;} - - /// - /// Desc:管理部门id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? manage_department_id {get;set;} - - /// - /// Desc:设备生命周期 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? life {get;set;} - - /// - /// Desc:技改编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? techno_logy_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:供应商id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_id {get;set;} - - /// - /// Desc:出厂编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? factory_code {get;set;} - - /// - /// Desc:合同/采购单号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contract_no {get;set;} - - /// - /// Desc:维保单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? maintenance_unit {get;set;} - - /// - /// Desc:维保电话 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? maintenance_phone {get;set;} - - /// - /// Desc:规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:安装地点 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? installation_location {get;set;} - - /// - /// Desc:是否成套设备 - /// Default: - /// Nullable:False - /// - public string is_complete_set {get;set;} = string.Empty; - - /// - /// Desc:DCS-ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? dcs_id {get;set;} - - /// - /// Desc:技术参数 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? technology_parameter {get;set;} - - /// - /// Desc:状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:吨位 - /// Default: - /// Nullable:True - /// - public decimal? tonnage {get;set;} - - /// - /// Desc:设备机台号 - /// Default: - /// Nullable:True - /// - public string? eqp_machine_num {get;set;} - - /// - /// Desc:模具Id - /// Default: - /// Nullable:True - /// - public string? mold_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 设备代码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 设备名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 设备类型id + /// + public string equip_type_id { get; set; } = string.Empty; + + /// + /// 设备生产日期 + /// + public string? product_date { get; set; } + + /// + /// 设备生产厂家 + /// + public string? manufacturer { get; set; } + + /// + /// 使用部门id + /// + public string? use_department_id { get; set; } + + /// + /// 安装日期 + /// + public string? install_date { get; set; } + + /// + /// 使用日期 + /// + public DateTime? use_date { get; set; } + + /// + /// 验收日期 + /// + public DateTime? accept_date { get; set; } + + /// + /// 管理部门id + /// + public string? manage_department_id { get; set; } + + /// + /// 设备生命周期 + /// + public string? life { get; set; } + + /// + /// 技改编码 + /// + public string? techno_logy_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 供应商id + /// + public string? supplier_id { get; set; } + + /// + /// 出厂编码 + /// + public string? factory_code { get; set; } + + /// + /// 合同/采购单号 + /// + public string? contract_no { get; set; } + + /// + /// 维保单位 + /// + public string? maintenance_unit { get; set; } + + /// + /// 维保电话 + /// + public string? maintenance_phone { get; set; } + + /// + /// 规格型号 + /// + public string? specification { get; set; } + + /// + /// 安装地点 + /// + public string? installation_location { get; set; } + + /// + /// 是否成套设备 + /// + public string is_complete_set { get; set; } = string.Empty; + + /// + /// DCS-ID + /// + public string? dcs_id { get; set; } + + /// + /// 技术参数 + /// + public string? technology_parameter { get; set; } + + /// + /// 状态 + /// + public string? status { get; set; } + + /// + /// 吨位 + /// + public decimal? tonnage { get; set; } + + /// + /// 设备机台号 + /// + public string? eqp_machine_num { get; set; } + + /// + /// 模具Id + /// + public string? mold_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFault.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFault.cs index 417de751..8ca00917 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFault.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFault.cs @@ -1,210 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 故障定义 +/// +[SugarTable("eqp_fault")] +public partial class EqpFault : BaseEntity { - /// - ///故障定义 - /// - [SugarTable("eqp_fault")] - public partial class EqpFault + public EqpFault() { - public EqpFault(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:故障类型ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_type_id {get;set;} - - /// - /// Desc:故障名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_name {get;set;} - - /// - /// Desc:故障编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_code {get;set;} - - /// - /// Desc:故障等级 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_level {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int? ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:True - /// - public int? enabled {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:True - /// - public short? deleted {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 故障类型ID + /// + public string? fault_type_id { get; set; } + + /// + /// 故障名称 + /// + public string? fault_name { get; set; } + + /// + /// 故障编号 + /// + public string? fault_code { get; set; } + + /// + /// 故障等级 + /// + public string? fault_level { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int? ordinal { get; set; } + + /// + /// 是否启用 + /// + public int? enabled { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultStrategy.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultStrategy.cs index b688e46f..b0590c88 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultStrategy.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultStrategy.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 故障策略 +/// +[SugarTable("eqp_fault_strategy")] +public partial class EqpFaultStrategy : BaseEntity { - /// - ///故障策略 - /// - [SugarTable("eqp_fault_strategy")] - public partial class EqpFaultStrategy + public EqpFaultStrategy() { - public EqpFaultStrategy(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:故障ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:是否默认 - /// Default: - /// Nullable:False - /// - public int is_default {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:策略编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? strategy_code {get;set;} - - /// - /// Desc:策略名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? strategy_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 故障ID + /// + public string? fault_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 是否默认 + /// + public int is_default { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 策略编号 + /// + public string? strategy_code { get; set; } + + /// + /// 策略名称 + /// + public string? strategy_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultType.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultType.cs index 936e6166..6ccb69d2 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultType.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpFaultType.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 故障类型 +/// +[SugarTable("eqp_fault_type")] +public partial class EqpFaultType : BaseEntity { - /// - ///故障类型 - /// - [SugarTable("eqp_fault_type")] - public partial class EqpFaultType + public EqpFaultType() { - public EqpFaultType(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:故障名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_type_name {get;set;} - - /// - /// Desc:故障编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? fault_type_code {get;set;} - - /// - /// Desc:父ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:图标 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? icon {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int? ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:True - /// - public int? enabled {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:True - /// - public short? deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 故障名称 + /// + public string? fault_type_name { get; set; } + + /// + /// 故障编号 + /// + public string? fault_type_code { get; set; } + + /// + /// 父ID + /// + public string? parent_id { get; set; } + + /// + /// 图标 + /// + public string? icon { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int? ordinal { get; set; } + + /// + /// 是否启用 + /// + public int? enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short? deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs index 15f662e5..1c6c27be 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs @@ -1,217 +1,152 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 保养项目 +/// +[SugarTable("eqp_maintain_item")] +public partial class EqpMaintainItem : BaseEntity { - /// - ///保养项目 - /// - [SugarTable("eqp_maintain_item")] - public partial class EqpMaintainItem + public EqpMaintainItem() { - public EqpMaintainItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:设备类型 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:项目编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:项目名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:保养类型 - /// Default: - /// Nullable:True - /// - public int? maintain_type {get;set;} - - /// - /// Desc:保养内容 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? maintain_content {get;set;} - - /// - /// Desc:描述 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int? ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:True - /// - public int? enabled {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:True - /// - public short? deleted {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 设备类型 + /// + public string? equip_type_id { get; set; } + + /// + /// 项目编码 + /// + public string? item_code { get; set; } + + /// + /// 项目名称 + /// + public string? item_name { get; set; } + + /// + /// 保养类型 + /// + public int? maintain_type { get; set; } + + /// + /// 保养内容 + /// + public string? maintain_content { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int? ordinal { get; set; } + + /// + /// 是否启用 + /// + public int? enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short? deleted { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItemExport.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItemExport.cs index c6099d37..dd3ad505 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItemExport.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItemExport.cs @@ -1,90 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_item_export")] +public partial class EqpMaintainItemExport : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_item_export")] - public partial class EqpMaintainItemExport + public EqpMaintainItemExport() { - public EqpMaintainItemExport(){ - - - } - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int? ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? maintain_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_content {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 排序 + /// + public int? ordinal { get; set; } + + /// + /// TODO + /// + public string? equip_type_name { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public int? maintain_type { get; set; } + + /// + /// TODO + /// + public string? maintain_content { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlan.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlan.cs index fae15e26..739030bf 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlan.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlan.cs @@ -1,308 +1,217 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_plan")] +public partial class EqpMaintainPlan : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_plan")] - public partial class EqpMaintainPlan + public EqpMaintainPlan() { - public EqpMaintainPlan(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repeat_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_repeat {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_start {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_stop {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int maintain_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_cycle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_cycle_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_delay_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_run_notice_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int repeat_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_post_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? plan_name { get; set; } + + /// + /// TODO + /// + public string? plan_code { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? repeat_user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? charge_user_id { get; set; } + + /// + /// TODO + /// + public int is_repeat { get; set; } + + /// + /// TODO + /// + public int is_start { get; set; } + + /// + /// TODO + /// + public int is_stop { get; set; } + + /// + /// TODO + /// + public int maintain_type { get; set; } + + /// + /// TODO + /// + public int plan_cycle { get; set; } + + /// + /// TODO + /// + public int plan_cycle_unit { get; set; } + + /// + /// TODO + /// + public int? plan_delay { get; set; } + + /// + /// TODO + /// + public int plan_delay_unit { get; set; } + + /// + /// TODO + /// + public int? plan_run_notice { get; set; } + + /// + /// TODO + /// + public int plan_run_notice_unit { get; set; } + + /// + /// TODO + /// + public int repeat_result { get; set; } + + /// + /// TODO + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public int is_send { get; set; } + + /// + /// TODO + /// + public string? send_post_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanItem.cs index b7ccc7f1..d45a7a2d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanItem.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_plan_item")] +public partial class EqpMaintainPlanItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_plan_item")] - public partial class EqpMaintainPlanItem + public EqpMaintainPlanItem() { - public EqpMaintainPlanItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_plan_template_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? maintain_plan_id { get; set; } + + /// + /// TODO + /// + public string? maintain_plan_template_id { get; set; } + + /// + /// TODO + /// + public string? maintain_item_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemDetail.cs index 878bdb26..873494af 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemDetail.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_plan_tem_detail")] +public partial class EqpMaintainPlanTemDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_plan_tem_detail")] - public partial class EqpMaintainPlanTemDetail + public EqpMaintainPlanTemDetail() { - public EqpMaintainPlanTemDetail(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_plan_template_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? maintain_plan_template_id { get; set; } + + /// + /// TODO + /// + public string? maintain_item_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemEquip.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemEquip.cs index 0e7c5bdc..06334761 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemEquip.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemEquip.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_plan_tem_equip")] +public partial class EqpMaintainPlanTemEquip : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_plan_tem_equip")] - public partial class EqpMaintainPlanTemEquip + public EqpMaintainPlanTemEquip() { - public EqpMaintainPlanTemEquip(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_plan_template_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? maintain_plan_template_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemplate.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemplate.cs index b9626383..4bdc71dc 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemplate.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainPlanTemplate.cs @@ -1,301 +1,212 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_plan_template")] +public partial class EqpMaintainPlanTemplate : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_plan_template")] - public partial class EqpMaintainPlanTemplate + public EqpMaintainPlanTemplate() { - public EqpMaintainPlanTemplate(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_cycle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_cycle_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_run_notice_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_delay_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_start {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_repeat {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_stop {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int repeat_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repeat_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int maintain_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_post_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? plan_code { get; set; } + + /// + /// TODO + /// + public string? plan_name { get; set; } + + /// + /// TODO + /// + public int plan_cycle { get; set; } + + /// + /// TODO + /// + public int plan_cycle_unit { get; set; } + + /// + /// TODO + /// + public int? plan_run_notice { get; set; } + + /// + /// TODO + /// + public int plan_run_notice_unit { get; set; } + + /// + /// TODO + /// + public int? plan_delay { get; set; } + + /// + /// TODO + /// + public int plan_delay_unit { get; set; } + + /// + /// TODO + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public int is_start { get; set; } + + /// + /// TODO + /// + public int is_repeat { get; set; } + + /// + /// TODO + /// + public int is_stop { get; set; } + + /// + /// TODO + /// + public int repeat_result { get; set; } + + /// + /// TODO + /// + public string? charge_user_id { get; set; } + + /// + /// TODO + /// + public string? repeat_user_id { get; set; } + + /// + /// TODO + /// + public int maintain_type { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int is_send { get; set; } + + /// + /// TODO + /// + public string? send_post_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecord.cs index f4799181..9b736c2a 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecord.cs @@ -1,287 +1,202 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_record")] +public partial class EqpMaintainRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_record")] - public partial class EqpMaintainRecord + public EqpMaintainRecord() { - public EqpMaintainRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? confirm_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? maintain_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_record_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime plan_maintain_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? after_send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_after_send {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? maintain_plan_id { get; set; } + + /// + /// TODO + /// + public string? result { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public DateTime? confirm_date_time { get; set; } + + /// + /// TODO + /// + public string? confirm_remark { get; set; } + + /// + /// TODO + /// + public string? confirm_result { get; set; } + + /// + /// TODO + /// + public string? confirm_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? maintain_record_date_time { get; set; } + + /// + /// TODO + /// + public string? maintain_record_user_id { get; set; } + + /// + /// TODO + /// + public DateTime plan_maintain_record_date_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? status { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public int? is_send { get; set; } + + /// + /// TODO + /// + public DateTime? send_date_time { get; set; } + + /// + /// TODO + /// + public string? send_id { get; set; } + + /// + /// TODO + /// + public DateTime? after_send_date_time { get; set; } + + /// + /// TODO + /// + public int? is_after_send { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDetail.cs index 049c2a2c..bf888f53 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDetail.cs @@ -1,245 +1,172 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_record_detail")] +public partial class EqpMaintainRecordDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_record_detail")] - public partial class EqpMaintainRecordDetail + public EqpMaintainRecordDetail() { - public EqpMaintainRecordDetail(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int maintain_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_content {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? confirm_result {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? maintain_record_id { get; set; } + + /// + /// TODO + /// + public string? maintain_item_id { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public int maintain_type { get; set; } + + /// + /// TODO + /// + public string? maintain_content { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? maintain_result { get; set; } + + /// + /// TODO + /// + public int? result { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? confirm_reason { get; set; } + + /// + /// TODO + /// + public int? confirm_result { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDocument.cs index 07ed8282..21468f8e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordDocument.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_record_document")] +public partial class EqpMaintainRecordDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_record_document")] - public partial class EqpMaintainRecordDocument + public EqpMaintainRecordDocument() { - public EqpMaintainRecordDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int maintain_record_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? maintain_record_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int maintain_record_type { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSapreParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSapreParts.cs index a0b7365b..bafe5d00 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSapreParts.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSapreParts.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_record_sapre_parts")] +public partial class EqpMaintainRecordSapreParts : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_record_sapre_parts")] - public partial class EqpMaintainRecordSapreParts + public EqpMaintainRecordSapreParts() { - public EqpMaintainRecordSapreParts(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int use_number {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_sapre_part_repeat {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? maintain_record_id { get; set; } + + /// + /// TODO + /// + public string? material_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int use_number { get; set; } + + /// + /// TODO + /// + public int? is_sapre_part_repeat { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSendPost.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSendPost.cs index 9327be81..02f65f72 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSendPost.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordSendPost.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_maintain_record_send_post")] +public partial class EqpMaintainRecordSendPost : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_maintain_record_send_post")] - public partial class EqpMaintainRecordSendPost + public EqpMaintainRecordSendPost() { - public EqpMaintainRecordSendPost(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintain_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_post {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? maintain_record_id { get; set; } + + /// + /// TODO + /// + public string? send_post { get; set; } + + /// + /// TODO + /// + public int is_send { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMeasuresRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMeasuresRecord.cs index 618a5f84..8d741f48 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMeasuresRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMeasuresRecord.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_measures_record")] +public partial class EqpMeasuresRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_measures_record")] - public partial class EqpMeasuresRecord + public EqpMeasuresRecord() { - public EqpMeasuresRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_report_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_measures_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? decribe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? oper_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? oper_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? oper_feedback {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_report_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_measures_id { get; set; } + + /// + /// TODO + /// + public string? decribe { get; set; } + + /// + /// TODO + /// + public string? oper_user { get; set; } + + /// + /// TODO + /// + public DateTime? oper_time { get; set; } + + /// + /// TODO + /// + public string? oper_feedback { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfiguration.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfiguration.cs index 0d07d5be..a2df7032 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfiguration.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfiguration.cs @@ -1,238 +1,167 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_message_configuration")] +public partial class EqpMessageConfiguration : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_message_configuration")] - public partial class EqpMessageConfiguration + public EqpMessageConfiguration() { - public EqpMessageConfiguration(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? message_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? message_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? validity {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? major_selection {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? message_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? org_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? message_type_id { get; set; } + + /// + /// TODO + /// + public string? department_id { get; set; } + + /// + /// TODO + /// + public string? message_name { get; set; } + + /// + /// TODO + /// + public int? validity { get; set; } + + /// + /// TODO + /// + public int? major_selection { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? message_code { get; set; } + + /// + /// TODO + /// + public string? parent_id { get; set; } + + /// + /// TODO + /// + public string? org_level { get; set; } + + /// + /// TODO + /// + public string? send_type_id { get; set; } + + /// + /// TODO + /// + public int? is_send { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfigurationUser.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfigurationUser.cs index d4752450..c293841b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfigurationUser.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMessageConfigurationUser.cs @@ -1,252 +1,177 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_message_configuration_user")] +public partial class EqpMessageConfigurationUser : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_message_configuration_user")] - public partial class EqpMessageConfigurationUser + public EqpMessageConfigurationUser() { - public EqpMessageConfigurationUser(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? parent_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? message_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? message_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? validity {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? major_selection {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? org_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? parent_id { get; set; } + + /// + /// TODO + /// + public string? message_type_id { get; set; } + + /// + /// TODO + /// + public string? department_id { get; set; } + + /// + /// TODO + /// + public int level { get; set; } + + /// + /// TODO + /// + public string? message_name { get; set; } + + /// + /// TODO + /// + public int? validity { get; set; } + + /// + /// TODO + /// + public int? major_selection { get; set; } + + /// + /// TODO + /// + public string? user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? org_level { get; set; } + + /// + /// TODO + /// + public string? use_type { get; set; } + + /// + /// TODO + /// + public string? user_name { get; set; } + + /// + /// TODO + /// + public string? user_code { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlan.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlan.cs index 67975439..b57386d6 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlan.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlan.cs @@ -1,392 +1,277 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan")] +public partial class EqpOverhaulPlan : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan")] - public partial class EqpOverhaulPlan + public EqpOverhaulPlan() { - public EqpOverhaulPlan(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int overhaul_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? plan_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_run_notice_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_delay_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? plan_start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? estimate_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? artificial_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? mat_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? parts_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_standard {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_delay {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? delay_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? finishe_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? do_plan_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int audit_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? audit_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? construction_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? docking_people_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? hours {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? project_leader_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? quality_control {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public int overhaul_type { get; set; } + + /// + /// TODO + /// + public string? plan_code { get; set; } + + /// + /// TODO + /// + public string? plan_name { get; set; } + + /// + /// TODO + /// + public DateTime? plan_time { get; set; } + + /// + /// TODO + /// + public int? plan_run_notice { get; set; } + + /// + /// TODO + /// + public int? plan_run_notice_unit { get; set; } + + /// + /// TODO + /// + public int? plan_delay { get; set; } + + /// + /// TODO + /// + public int? plan_delay_unit { get; set; } + + /// + /// TODO + /// + public DateTime? plan_start_time { get; set; } + + /// + /// TODO + /// + public double? estimate_cost { get; set; } + + /// + /// TODO + /// + public double? artificial_cost { get; set; } + + /// + /// TODO + /// + public double? mat_cost { get; set; } + + /// + /// TODO + /// + public double? parts_cost { get; set; } + + /// + /// TODO + /// + public string? overhaul_content { get; set; } + + /// + /// TODO + /// + public string? overhaul_standard { get; set; } + + /// + /// TODO + /// + public int is_delay { get; set; } + + /// + /// TODO + /// + public DateTime? delay_time { get; set; } + + /// + /// TODO + /// + public DateTime? finishe_time { get; set; } + + /// + /// TODO + /// + public string? status { get; set; } + + /// + /// TODO + /// + public string? do_plan_user { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? audit_content { get; set; } + + /// + /// TODO + /// + public int audit_result { get; set; } + + /// + /// TODO + /// + public DateTime? audit_time { get; set; } + + /// + /// TODO + /// + public string? audit_user_id { get; set; } + + /// + /// TODO + /// + public string? audit_user_name { get; set; } + + /// + /// TODO + /// + public string? construction_unit { get; set; } + + /// + /// TODO + /// + public string? docking_people_id { get; set; } + + /// + /// TODO + /// + public string? hours { get; set; } + + /// + /// TODO + /// + public string? project_leader_id { get; set; } + + /// + /// TODO + /// + public string? quality_control { get; set; } + + /// + /// TODO + /// + public string? section_id { get; set; } + + /// + /// TODO + /// + public string? unit_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanAuditRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanAuditRecord.cs index 80ff144a..0d6a3ea2 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanAuditRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanAuditRecord.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_audit_record")] +public partial class EqpOverhaulPlanAuditRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_audit_record")] - public partial class EqpOverhaulPlanAuditRecord + public EqpOverhaulPlanAuditRecord() { - public EqpOverhaulPlanAuditRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int audit_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? audit_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_content {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public int audit_result { get; set; } + + /// + /// TODO + /// + public string? audit_user_id { get; set; } + + /// + /// TODO + /// + public string? audit_user_name { get; set; } + + /// + /// TODO + /// + public DateTime? audit_time { get; set; } + + /// + /// TODO + /// + public string? audit_content { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDetail.cs index 6581ed65..e836d16b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDetail.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_detail")] +public partial class EqpOverhaulPlanDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_detail")] - public partial class EqpOverhaulPlanDetail + public EqpOverhaulPlanDetail() { - public EqpOverhaulPlanDetail(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDleayRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDleayRecord.cs index d8b82783..506b5999 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDleayRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanDleayRecord.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_dleay_record")] +public partial class EqpOverhaulPlanDleayRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_dleay_record")] - public partial class EqpOverhaulPlanDleayRecord + public EqpOverhaulPlanDleayRecord() { - public EqpOverhaulPlanDleayRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? befor_delay_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? after_delay_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public DateTime? befor_delay_time { get; set; } + + /// + /// TODO + /// + public DateTime? after_delay_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanParticipateUse.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanParticipateUse.cs index 3836be7c..ba8912c3 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanParticipateUse.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanParticipateUse.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_participate_use")] +public partial class EqpOverhaulPlanParticipateUse : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_participate_use")] - public partial class EqpOverhaulPlanParticipateUse + public EqpOverhaulPlanParticipateUse() { - public EqpOverhaulPlanParticipateUse(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public string? user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanPost.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanPost.cs index 0a1262d7..e1c3b7b0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanPost.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanPost.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_post")] +public partial class EqpOverhaulPlanPost : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_post")] - public partial class EqpOverhaulPlanPost + public EqpOverhaulPlanPost() { - public EqpOverhaulPlanPost(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? post_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public string? post_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRecord.cs new file mode 100644 index 00000000..96abca6b --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRecord.cs @@ -0,0 +1,177 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_run_record")] +public partial class EqpOverhaulPlanRunRecord : BaseEntity +{ + public EqpOverhaulPlanRunRecord() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public int? category { get; set; } + + /// + /// TODO + /// + public int? level { get; set; } + + /// + /// TODO + /// + public double? shutdown_cost { get; set; } + + /// + /// TODO + /// + public int is_complete { get; set; } + + /// + /// TODO + /// + public DateTime? recovery_time { get; set; } + + /// + /// TODO + /// + public double? repair_cost { get; set; } + + /// + /// TODO + /// + public string? reason { get; set; } + + /// + /// TODO + /// + public string? countermeasure { get; set; } + + /// + /// TODO + /// + public int is_use_spare_parts { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int? repair_cost_unit { get; set; } + + /// + /// TODO + /// + public int? shutdown_cost_unit { get; set; } + +} diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRedDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRedDocument.cs index fed43981..0734a16e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRedDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRedDocument.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_run_red_document")] +public partial class EqpOverhaulPlanRunRedDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_run_red_document")] - public partial class EqpOverhaulPlanRunRedDocument + public EqpOverhaulPlanRunRedDocument() { - public EqpOverhaulPlanRunRedDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_run_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_run_record_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunSapreParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunSapreParts.cs index 33d2373b..a986d161 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunSapreParts.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunSapreParts.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_run_sapre_parts")] +public partial class EqpOverhaulPlanRunSapreParts : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_run_sapre_parts")] - public partial class EqpOverhaulPlanRunSapreParts + public EqpOverhaulPlanRunSapreParts() { - public EqpOverhaulPlanRunSapreParts(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_run_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int use_number {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_run_record_id { get; set; } + + /// + /// TODO + /// + public string? material_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int use_number { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanSchedule.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanSchedule.cs index a5d01536..7fb6c6a0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanSchedule.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanSchedule.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_schedule")] +public partial class EqpOverhaulPlanSchedule : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_schedule")] - public partial class EqpOverhaulPlanSchedule + public EqpOverhaulPlanSchedule() { - public EqpOverhaulPlanSchedule(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime schedule_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? feedback_info {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? progress {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public DateTime schedule_date { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? content { get; set; } + + /// + /// TODO + /// + public string? charge_user { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? feedback_info { get; set; } + + /// + /// TODO + /// + public string? progress { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanScheduleDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanScheduleDetail.cs index 4580dbed..e9ce7f83 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanScheduleDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanScheduleDetail.cs @@ -1,217 +1,152 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_overhaul_plan_schedule_detail")] +public partial class EqpOverhaulPlanScheduleDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_overhaul_plan_schedule_detail")] - public partial class EqpOverhaulPlanScheduleDetail + public EqpOverhaulPlanScheduleDetail() { - public EqpOverhaulPlanScheduleDetail(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? overhaul_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? schedule_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime schedule_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? progress {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? feedback_info {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? overhaul_plan_id { get; set; } + + /// + /// TODO + /// + public string? schedule_id { get; set; } + + /// + /// TODO + /// + public DateTime schedule_date { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? content { get; set; } + + /// + /// TODO + /// + public string? charge_user { get; set; } + + /// + /// TODO + /// + public string? progress { get; set; } + + /// + /// TODO + /// + public string? feedback_info { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethod.cs index 3b459542..99549a59 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethod.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethod.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_method")] +public partial class EqpPeriodExamMethod : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_method")] - public partial class EqpPeriodExamMethod + public EqpPeriodExamMethod() { - public EqpPeriodExamMethod(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_code {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? formular {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? method_name { get; set; } + + /// + /// TODO + /// + public string? method_code { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? formular { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDataItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDataItem.cs index d52538d8..2ab4f9b3 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDataItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDataItem.cs @@ -1,238 +1,167 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_method_data_item")] +public partial class EqpPeriodExamMethodDataItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_method_data_item")] - public partial class EqpPeriodExamMethodDataItem + public EqpPeriodExamMethodDataItem() { - public EqpPeriodExamMethodDataItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int data_item_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_show_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double data_item_value {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_formula_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_id { get; set; } + + /// + /// TODO + /// + public int data_item_type { get; set; } + + /// + /// TODO + /// + public string? data_item_code { get; set; } + + /// + /// TODO + /// + public string? data_item_name { get; set; } + + /// + /// TODO + /// + public string? data_item_show_code { get; set; } + + /// + /// TODO + /// + public double data_item_value { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? method_type { get; set; } + + /// + /// TODO + /// + public string? period_formula_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDocument.cs index 03b500c0..8651fc33 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodDocument.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_method_document")] +public partial class EqpPeriodExamMethodDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_method_document")] - public partial class EqpPeriodExamMethodDocument + public EqpPeriodExamMethodDocument() { - public EqpPeriodExamMethodDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? method_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodFormula.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodFormula.cs index 9ff74b23..917e2b83 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodFormula.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamMethodFormula.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_method_formula")] +public partial class EqpPeriodExamMethodFormula : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_method_formula")] - public partial class EqpPeriodExamMethodFormula + public EqpPeriodExamMethodFormula() { - public EqpPeriodExamMethodFormula(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? formular {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? method_type { get; set; } + + /// + /// TODO + /// + public string? formular { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlan.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlan.cs index b46c4be2..3d51ef0f 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlan.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlan.cs @@ -1,301 +1,212 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_plan")] +public partial class EqpPeriodExamPlan : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_plan")] - public partial class EqpPeriodExamPlan + public EqpPeriodExamPlan() { - public EqpPeriodExamPlan(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? circle_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_template_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? remind_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? run_circle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? template_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? template_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remind_time_unit {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? plan_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_stop {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? plan_name { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? circle_type { get; set; } + + /// + /// TODO + /// + public string? period_exam_template_id { get; set; } + + /// + /// TODO + /// + public int? remind_time { get; set; } + + /// + /// TODO + /// + public int? run_circle { get; set; } + + /// + /// TODO + /// + public string? template_name { get; set; } + + /// + /// TODO + /// + public string? template_code { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? charge_user { get; set; } + + /// + /// TODO + /// + public string? plan_code { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? remind_time_unit { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_id { get; set; } + + /// + /// TODO + /// + public DateTime? plan_record_date_time { get; set; } + + /// + /// TODO + /// + public int? is_stop { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlanItemResult.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlanItemResult.cs index 2cd4c990..2a4b0bed 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlanItemResult.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamPlanItemResult.cs @@ -1,455 +1,322 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_plan_item_result")] +public partial class EqpPeriodExamPlanItemResult : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_plan_item_result")] - public partial class EqpPeriodExamPlanItemResult + public EqpPeriodExamPlanItemResult() { - public EqpPeriodExamPlanItemResult(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_data_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_resulr {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_name {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? coefficient {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend11 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend12 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend13 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend14 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend15 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend16 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend17 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend18 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend19 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? density_extend20 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? error_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_record_detail_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rule_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? formular {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? judge_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_show_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lowand_hight {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? display_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? indication_value {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? period_exam_record_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_data_item_id { get; set; } + + /// + /// TODO + /// + public string? item_resulr { get; set; } + + /// + /// TODO + /// + public string? data_item_code { get; set; } + + /// + /// TODO + /// + public string? data_item_name { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? coefficient { get; set; } + + /// + /// TODO + /// + public string? density_extend01 { get; set; } + + /// + /// TODO + /// + public string? density_extend02 { get; set; } + + /// + /// TODO + /// + public string? density_extend03 { get; set; } + + /// + /// TODO + /// + public string? density_extend04 { get; set; } + + /// + /// TODO + /// + public string? density_extend05 { get; set; } + + /// + /// TODO + /// + public string? density_extend06 { get; set; } + + /// + /// TODO + /// + public string? density_extend07 { get; set; } + + /// + /// TODO + /// + public string? density_extend08 { get; set; } + + /// + /// TODO + /// + public string? density_extend09 { get; set; } + + /// + /// TODO + /// + public string? density_extend10 { get; set; } + + /// + /// TODO + /// + public string? density_extend11 { get; set; } + + /// + /// TODO + /// + public string? density_extend12 { get; set; } + + /// + /// TODO + /// + public string? density_extend13 { get; set; } + + /// + /// TODO + /// + public string? density_extend14 { get; set; } + + /// + /// TODO + /// + public string? density_extend15 { get; set; } + + /// + /// TODO + /// + public string? density_extend16 { get; set; } + + /// + /// TODO + /// + public string? density_extend17 { get; set; } + + /// + /// TODO + /// + public string? density_extend18 { get; set; } + + /// + /// TODO + /// + public string? density_extend19 { get; set; } + + /// + /// TODO + /// + public string? density_extend20 { get; set; } + + /// + /// TODO + /// + public string? error_value { get; set; } + + /// + /// TODO + /// + public string? method_type { get; set; } + + /// + /// TODO + /// + public string? period_exam_record_detail_id { get; set; } + + /// + /// TODO + /// + public string? rule_type { get; set; } + + /// + /// TODO + /// + public string? standard_value { get; set; } + + /// + /// TODO + /// + public string? formular { get; set; } + + /// + /// TODO + /// + public string? judge_describe { get; set; } + + /// + /// TODO + /// + public string? period_exam_plan_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_result { get; set; } + + /// + /// TODO + /// + public string? data_item_show_code { get; set; } + + /// + /// TODO + /// + public string? lowand_hight { get; set; } + + /// + /// TODO + /// + public string? display_value { get; set; } + + /// + /// TODO + /// + public string? indication_value { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecord.cs index b78d8066..35ba9fdd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecord.cs @@ -1,357 +1,252 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_record")] +public partial class EqpPeriodExamRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_record")] - public partial class EqpPeriodExamRecord + public EqpPeriodExamRecord() { - public EqpPeriodExamRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? judge_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_result_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double result_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? detection_method {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? detector {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? formular {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? relative_standard_deviation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_licence_number {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_sample_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value_deviation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? processe_state {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rule_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? plan_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_task_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? group_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? record_date_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_plan_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_result { get; set; } + + /// + /// TODO + /// + public string? judge_describe { get; set; } + + /// + /// TODO + /// + public string? period_exam_result_describe { get; set; } + + /// + /// TODO + /// + public double result_value { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? detection_method { get; set; } + + /// + /// TODO + /// + public string? detector { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? formular { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? method_code { get; set; } + + /// + /// TODO + /// + public string? method_name { get; set; } + + /// + /// TODO + /// + public string? period_exam_plan_code { get; set; } + + /// + /// TODO + /// + public string? period_exam_plan_name { get; set; } + + /// + /// TODO + /// + public string? relative_standard_deviation { get; set; } + + /// + /// TODO + /// + public string? standard_licence_number { get; set; } + + /// + /// TODO + /// + public string? standard_sample_name { get; set; } + + /// + /// TODO + /// + public string? standard_value { get; set; } + + /// + /// TODO + /// + public string? standard_value_deviation { get; set; } + + /// + /// TODO + /// + public string? standard_value_unit { get; set; } + + /// + /// TODO + /// + public string? processe_state { get; set; } + + /// + /// TODO + /// + public string? rule_type { get; set; } + + /// + /// TODO + /// + public string? status { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_id { get; set; } + + /// + /// TODO + /// + public DateTime? plan_record_date_time { get; set; } + + /// + /// TODO + /// + public string? plan_task_code { get; set; } + + /// + /// TODO + /// + public int? group_value { get; set; } + + /// + /// TODO + /// + public DateTime? record_date_time { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecordDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecordDetail.cs index 414bcb8a..88376c91 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecordDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamRecordDetail.cs @@ -1,308 +1,217 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_record_detail")] +public partial class EqpPeriodExamRecordDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_record_detail")] - public partial class EqpPeriodExamRecordDetail + public EqpPeriodExamRecordDetail() { - public EqpPeriodExamRecordDetail(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_formula_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_sample_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_licence_number {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? detector {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? detection_method {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? standard_value_deviation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? relative_standard_deviation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? formular {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? method_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? judge_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_result_describe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? result_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? period_exam_record_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_plan_id { get; set; } + + /// + /// TODO + /// + public string? method_type { get; set; } + + /// + /// TODO + /// + public string? period_formula_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? standard_sample_name { get; set; } + + /// + /// TODO + /// + public string? standard_value { get; set; } + + /// + /// TODO + /// + public string? standard_value_unit { get; set; } + + /// + /// TODO + /// + public string? standard_licence_number { get; set; } + + /// + /// TODO + /// + public string? detector { get; set; } + + /// + /// TODO + /// + public string? detection_method { get; set; } + + /// + /// TODO + /// + public string? standard_value_deviation { get; set; } + + /// + /// TODO + /// + public string? relative_standard_deviation { get; set; } + + /// + /// TODO + /// + public string? formular { get; set; } + + /// + /// TODO + /// + public string? method_name { get; set; } + + /// + /// TODO + /// + public string? method_code { get; set; } + + /// + /// TODO + /// + public string? period_exam_result { get; set; } + + /// + /// TODO + /// + public string? judge_describe { get; set; } + + /// + /// TODO + /// + public string? period_exam_result_describe { get; set; } + + /// + /// TODO + /// + public string? result_value { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplate.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplate.cs index 759b0d43..1b0669a9 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplate.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplate.cs @@ -1,294 +1,207 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_template")] +public partial class EqpPeriodExamTemplate : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_template")] - public partial class EqpPeriodExamTemplate + public EqpPeriodExamTemplate() { - public EqpPeriodExamTemplate(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? template_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? std_sample_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double std_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? std_sample_license {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_method {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_equip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double test_value_std_deviation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double relative_std_deviation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? template_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? std_value_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? circle_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? remind_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remind_time_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? run_circle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? template_name { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_id { get; set; } + + /// + /// TODO + /// + public string? std_sample_name { get; set; } + + /// + /// TODO + /// + public double std_value { get; set; } + + /// + /// TODO + /// + public string? std_sample_license { get; set; } + + /// + /// TODO + /// + public string? equip_method { get; set; } + + /// + /// TODO + /// + public string? check_equip { get; set; } + + /// + /// TODO + /// + public double test_value_std_deviation { get; set; } + + /// + /// TODO + /// + public double relative_std_deviation { get; set; } + + /// + /// TODO + /// + public string? template_code { get; set; } + + /// + /// TODO + /// + public string? std_value_unit { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? charge_user { get; set; } + + /// + /// TODO + /// + public string? circle_type { get; set; } + + /// + /// TODO + /// + public int? remind_time { get; set; } + + /// + /// TODO + /// + public string? remind_time_unit { get; set; } + + /// + /// TODO + /// + public int? run_circle { get; set; } + + /// + /// TODO + /// + public DateTime start_time { get; set; } = DateTime.Now; + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplateRule.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplateRule.cs index 2eb1b7a3..9eba6b66 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplateRule.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpPeriodExamTemplateRule.cs @@ -1,280 +1,197 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_period_exam_template_rule")] +public partial class EqpPeriodExamTemplateRule : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_period_exam_template_rule")] - public partial class EqpPeriodExamTemplateRule + public EqpPeriodExamTemplateRule() { - public EqpPeriodExamTemplateRule(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_template_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rule_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rule_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? period_exam_method_data_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? data_item_show_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? std_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? low_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int low_value_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int high_value_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? high_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rule_type {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? low_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? high_type {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? period_exam_template_id { get; set; } + + /// + /// TODO + /// + public string? rule_name { get; set; } + + /// + /// TODO + /// + public string? rule_code { get; set; } + + /// + /// TODO + /// + public string? period_exam_method_data_item_id { get; set; } + + /// + /// TODO + /// + public string? data_item_name { get; set; } + + /// + /// TODO + /// + public string? data_item_show_code { get; set; } + + /// + /// TODO + /// + public double? std_value { get; set; } + + /// + /// TODO + /// + public string? low_value { get; set; } + + /// + /// TODO + /// + public int low_value_include { get; set; } + + /// + /// TODO + /// + public int high_value_include { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? high_value { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? rule_type { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int? low_type { get; set; } + + /// + /// TODO + /// + public int? high_type { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairAnalysisRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairAnalysisRecord.cs index 9ed4d94c..49e56317 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairAnalysisRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairAnalysisRecord.cs @@ -1,70 +1,47 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_analysis_record")] +public partial class EqpRepairAnalysisRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_analysis_record")] - public partial class EqpRepairAnalysisRecord + public EqpRepairAnalysisRecord() { - public EqpRepairAnalysisRecord(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public int id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_department {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? year {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? month {get;set;} - + } + /// + /// TODO + /// + public string? user_department { get; set; } + + /// + /// TODO + /// + public string? section { get; set; } + + /// + /// TODO + /// + public string? equip_type { get; set; } + + /// + /// TODO + /// + public int? num { get; set; } + + /// + /// TODO + /// + public int? year { get; set; } + + /// + /// TODO + /// + public int? month { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs index bf174db1..874ef15f 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs @@ -1,420 +1,152 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备报修申请 +/// +[SugarTable("eqp_repair_apply")] +public partial class EqpRepairApply : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply")] - public partial class EqpRepairApply + public EqpRepairApply() { - public EqpRepairApply(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? fault_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? expect_complete_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_ugent {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? fault_phenomenon {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? closing_remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? invalid_remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? professional_choice {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? instructions {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? start_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_equip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? reject_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reject_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reject_user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? shift_remarks {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? shift_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? shift_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? shift_user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_msg_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? to_received_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? to_repair_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_untreated_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_reive_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_untreated_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 申请编码 + /// + public string? code { get; set; } + + /// + /// 申请名称 + /// + public string? name { get; set; } + + /// + /// 设备ID + /// + public string? equip_id { get; set; } + + /// + /// 申请用户ID + /// + public string? apply_user_id { get; set; } + + /// + /// 故障ID + /// + public string? fault_id { get; set; } + + /// + /// 期望完成时间 + /// + public DateTime? expect_complete_time { get; set; } + + /// + /// 是否紧急 + /// + public int? is_ugent { get; set; } + + /// + /// 现象描述 + /// + public string? description { get; set; } + + /// + /// 状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 原因 + /// + public string? reason { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 是否启用 + /// + public int? enabled { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 是否外修 + /// + public int? is_out_apply { get; set; } + + /// + /// 安装位置 + /// + public string? installation_position { get; set; } + + /// + /// 是否完成 + /// + public string? is_complete { get; set; } + + /// + /// 完成时间 + /// + public DateTime? complete_time { get; set; } + + /// + /// 维修耗时 + /// + public string? repair_take_time { get; set; } + + /// + /// 是否停机 + /// + public int? is_halt { get; set; } + + /// + /// 停机时长 + /// + public string? halt_take_time { get; set; } + + /// + /// 维修描述 + /// + public string? repair_description { get; set; } + + /// + /// 维修人id/责任人id + /// + public string? repairer_id { get; set; } + + /// + /// 附件 + /// + public string? attachment { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyChargeUser.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyChargeUser.cs index aeb87ccf..3491e4a1 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyChargeUser.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyChargeUser.cs @@ -1,217 +1,152 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_charge_user")] +public partial class EqpRepairApplyChargeUser : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_charge_user")] - public partial class EqpRepairApplyChargeUser + public EqpRepairApplyChargeUser() { - public EqpRepairApplyChargeUser(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_accept {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int estimate_repair_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? applyt_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_boss_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_id { get; set; } + + /// + /// TODO + /// + public string? charge_user_id { get; set; } + + /// + /// TODO + /// + public int is_accept { get; set; } + + /// + /// TODO + /// + public int estimate_repair_time { get; set; } + + /// + /// TODO + /// + public string? applyt_reason { get; set; } + + /// + /// TODO + /// + public string? apply_user_id { get; set; } + + /// + /// TODO + /// + public string? apply_boss_user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDleayRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDleayRecord.cs index 371c0b86..f03b75f2 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDleayRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDleayRecord.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_dleay_record")] +public partial class EqpRepairApplyDleayRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_dleay_record")] - public partial class EqpRepairApplyDleayRecord + public EqpRepairApplyDleayRecord() { - public EqpRepairApplyDleayRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_department_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_department_user {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime estimate_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? delay_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_id { get; set; } + + /// + /// TODO + /// + public string? equip_department_user { get; set; } + + /// + /// TODO + /// + public string? repair_department_user { get; set; } + + /// + /// TODO + /// + public DateTime estimate_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string? delay_reason { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDocument.cs index e64cc9f8..80ec8531 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyDocument.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_document")] +public partial class EqpRepairApplyDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_document")] - public partial class EqpRepairApplyDocument + public EqpRepairApplyDocument() { - public EqpRepairApplyDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExt.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExt.cs index 6fcaf2da..7b0a9aa9 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExt.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExt.cs @@ -1,231 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_ext")] +public partial class EqpRepairApplyExt : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_ext")] - public partial class EqpRepairApplyExt + public EqpRepairApplyExt() { - public EqpRepairApplyExt(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? estimate_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? requirement {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? supplier {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int audit_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? audit_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_id { get; set; } + + /// + /// TODO + /// + public double? estimate_cost { get; set; } + + /// + /// TODO + /// + public string? requirement { get; set; } + + /// + /// TODO + /// + public string? reason { get; set; } + + /// + /// TODO + /// + public string? supplier { get; set; } + + /// + /// TODO + /// + public int audit_result { get; set; } + + /// + /// TODO + /// + public string? audit_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? audit_time { get; set; } + + /// + /// TODO + /// + public string? audit_content { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRecord.cs index 8fe9216c..8685c860 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRecord.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_ext_record")] +public partial class EqpRepairApplyExtRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_ext_record")] - public partial class EqpRepairApplyExtRecord + public EqpRepairApplyExtRecord() { - public EqpRepairApplyExtRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? supplier {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? repair_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? cost_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? cost_time_unit {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_id { get; set; } + + /// + /// TODO + /// + public string? supplier { get; set; } + + /// + /// TODO + /// + public double? cost { get; set; } + + /// + /// TODO + /// + public DateTime? repair_time { get; set; } + + /// + /// TODO + /// + public double? cost_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int? cost_time_unit { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRedDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRedDocument.cs index ce52bd3c..1d64d59c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRedDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyExtRedDocument.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_ext_red_document")] +public partial class EqpRepairApplyExtRedDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_ext_red_document")] - public partial class EqpRepairApplyExtRedDocument + public EqpRepairApplyExtRedDocument() { - public EqpRepairApplyExtRedDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_ext_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_ext_record_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyMsgLog.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyMsgLog.cs index 3be10e25..488fa19f 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyMsgLog.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApplyMsgLog.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_apply_msg_log")] +public partial class EqpRepairApplyMsgLog : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_apply_msg_log")] - public partial class EqpRepairApplyMsgLog + public EqpRepairApplyMsgLog() { - public EqpRepairApplyMsgLog(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? msg_config_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? apply_code { get; set; } + + /// + /// TODO + /// + public string? msg_config_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairCompletionRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairCompletionRecord.cs index 8a241db4..5b195fcd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairCompletionRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairCompletionRecord.cs @@ -1,91 +1,62 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_completion_record")] +public partial class EqpRepairCompletionRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_completion_record")] - public partial class EqpRepairCompletionRecord + public EqpRepairCompletionRecord() { - public EqpRepairCompletionRecord(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public int id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_department {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? year {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? month {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? curr_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? last_month_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? last_year_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? sum_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? diff_month_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? diff_sum_month_num {get;set;} - + } + /// + /// TODO + /// + public string? user_department { get; set; } + + /// + /// TODO + /// + public int? year { get; set; } + + /// + /// TODO + /// + public int? month { get; set; } + + /// + /// TODO + /// + public int? curr_num { get; set; } + + /// + /// TODO + /// + public int? last_month_num { get; set; } + + /// + /// TODO + /// + public int? last_year_num { get; set; } + + /// + /// TODO + /// + public int? sum_num { get; set; } + + /// + /// TODO + /// + public int? diff_month_num { get; set; } + + /// + /// TODO + /// + public int? diff_sum_month_num { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRatioRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRatioRecord.cs index 7d6d8a5e..99e2b244 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRatioRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRatioRecord.cs @@ -1,104 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_ratio_record")] +public partial class EqpRepairRatioRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_ratio_record")] - public partial class EqpRepairRatioRecord + public EqpRepairRatioRecord() { - public EqpRepairRatioRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - public int id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? year {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? month {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? day {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? no_repair_total {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? before_no_repair {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? curr_apply_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? assign_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? received_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? repair_num {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// TODO + /// + public int? year { get; set; } + + /// + /// TODO + /// + public int? month { get; set; } + + /// + /// TODO + /// + public int? day { get; set; } + + /// + /// TODO + /// + public int? no_repair_total { get; set; } + + /// + /// TODO + /// + public int? before_no_repair { get; set; } + + /// + /// TODO + /// + public int? curr_apply_num { get; set; } + + /// + /// TODO + /// + public int? assign_num { get; set; } + + /// + /// TODO + /// + public int? received_num { get; set; } + + /// + /// TODO + /// + public int? repair_num { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecord.cs index 9cff1911..12888711 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecord.cs @@ -1,315 +1,222 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_record")] +public partial class EqpRepairRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_record")] - public partial class EqpRepairRecord + public EqpRepairRecord() { - public EqpRepairRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_apply_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? fault_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_complete {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_shutdown {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? shutdown_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? recovery_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double repair_cost {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? strategy {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_outsourcing {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_use_spare_parts {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? applyt_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? apply_boss_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_boss_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? repair_cost_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? shutdown_cost_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? fault_remark {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_apply_id { get; set; } + + /// + /// TODO + /// + public string? fault_id { get; set; } + + /// + /// TODO + /// + public int is_complete { get; set; } + + /// + /// TODO + /// + public int is_shutdown { get; set; } + + /// + /// TODO + /// + public double? shutdown_cost { get; set; } + + /// + /// TODO + /// + public DateTime? recovery_time { get; set; } + + /// + /// TODO + /// + public double repair_cost { get; set; } + + /// + /// TODO + /// + public string? charge_user_id { get; set; } + + /// + /// TODO + /// + public string? reason { get; set; } + + /// + /// TODO + /// + public string? strategy { get; set; } + + /// + /// TODO + /// + public int is_outsourcing { get; set; } + + /// + /// TODO + /// + public int is_use_spare_parts { get; set; } + + /// + /// TODO + /// + public string? applyt_reason { get; set; } + + /// + /// TODO + /// + public string? apply_user_id { get; set; } + + /// + /// TODO + /// + public string? confirm_user_id { get; set; } + + /// + /// TODO + /// + public string? apply_boss_user_id { get; set; } + + /// + /// TODO + /// + public string? confirm_boss_user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? level { get; set; } + + /// + /// TODO + /// + public int? repair_cost_unit { get; set; } + + /// + /// TODO + /// + public int? shutdown_cost_unit { get; set; } + + /// + /// TODO + /// + public string? fault_remark { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordDocument.cs index 80f28860..0a7478f5 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordDocument.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_record_document")] +public partial class EqpRepairRecordDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_record_document")] - public partial class EqpRepairRecordDocument + public EqpRepairRecordDocument() { - public EqpRepairRecordDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_reocrd_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_reocrd_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordSapreParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordSapreParts.cs index 0551f4ed..431837a7 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordSapreParts.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRecordSapreParts.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_record_sapre_parts")] +public partial class EqpRepairRecordSapreParts : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_record_sapre_parts")] - public partial class EqpRepairRecordSapreParts + public EqpRepairRecordSapreParts() { - public EqpRepairRecordSapreParts(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repair_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int use_number {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? repair_record_id { get; set; } + + /// + /// TODO + /// + public string? material_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int use_number { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairStatusLog.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairStatusLog.cs index 13884822..13dc26b5 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairStatusLog.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairStatusLog.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_status_log")] +public partial class EqpRepairStatusLog : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_status_log")] - public partial class EqpRepairStatusLog + public EqpRepairStatusLog() { - public EqpRepairStatusLog(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? stop_time_start {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? stop_time_end {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public DateTime? stop_time_start { get; set; } + + /// + /// TODO + /// + public DateTime? stop_time_end { get; set; } + + /// + /// TODO + /// + public string? type { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairSummary.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairSummary.cs index 151ef2a7..d3bca630 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairSummary.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairSummary.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_repair_summary")] +public partial class EqpRepairSummary : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_repair_summary")] - public partial class EqpRepairSummary + public EqpRepairSummary() { - public EqpRepairSummary(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? summary_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? plan_date { get; set; } + + /// + /// TODO + /// + public string? summary_content { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRfidEquipRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRfidEquipRecord.cs index 7e228517..058dd406 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRfidEquipRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRfidEquipRecord.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_rfid_equip_record")] +public partial class EqpRfidEquipRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_rfid_equip_record")] - public partial class EqpRfidEquipRecord + public EqpRfidEquipRecord() { - public EqpRfidEquipRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? rfid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? rfid { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentAnalyze.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentAnalyze.cs index d3c0e226..d893100d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentAnalyze.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentAnalyze.cs @@ -1,287 +1,202 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_analyze")] +public partial class EqpSeriousAccidentAnalyze : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_analyze")] - public partial class EqpSeriousAccidentAnalyze + public EqpSeriousAccidentAnalyze() { - public EqpSeriousAccidentAnalyze(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_report_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? summary {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? opinions {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int accident_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int analyze_itype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accident_degree {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accident_liability {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public float? direct_loss {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public float? indirect_loss {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? indirect_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? loss_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? main_charge_psn {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? main_mange_psn {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? secondary_charge_psn {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? secondary_mange_psn {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? department_duty {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_report_id { get; set; } + + /// + /// TODO + /// + public string? reason { get; set; } + + /// + /// TODO + /// + public string? summary { get; set; } + + /// + /// TODO + /// + public string? opinions { get; set; } + + /// + /// TODO + /// + public int accident_level { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int analyze_itype { get; set; } + + /// + /// TODO + /// + public string? accident_degree { get; set; } + + /// + /// TODO + /// + public string? accident_liability { get; set; } + + /// + /// TODO + /// + public float? direct_loss { get; set; } + + /// + /// TODO + /// + public float? indirect_loss { get; set; } + + /// + /// TODO + /// + public string? indirect_reason { get; set; } + + /// + /// TODO + /// + public string? loss_type { get; set; } + + /// + /// TODO + /// + public string? main_charge_psn { get; set; } + + /// + /// TODO + /// + public string? main_mange_psn { get; set; } + + /// + /// TODO + /// + public string? secondary_charge_psn { get; set; } + + /// + /// TODO + /// + public string? secondary_mange_psn { get; set; } + + /// + /// TODO + /// + public string? department_duty { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentChargeUser.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentChargeUser.cs index 60781974..b097f29d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentChargeUser.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentChargeUser.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_charge_user")] +public partial class EqpSeriousAccidentChargeUser : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_charge_user")] - public partial class EqpSeriousAccidentChargeUser + public EqpSeriousAccidentChargeUser() { - public EqpSeriousAccidentChargeUser(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_report_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_charge {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_report_id { get; set; } + + /// + /// TODO + /// + public string? charge_user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int? is_charge { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentCheckReport.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentCheckReport.cs index 300d9b41..eefc24f3 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentCheckReport.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentCheckReport.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_check_report")] +public partial class EqpSeriousAccidentCheckReport : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_check_report")] - public partial class EqpSeriousAccidentCheckReport + public EqpSeriousAccidentCheckReport() { - public EqpSeriousAccidentCheckReport(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_report_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? report_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_report_id { get; set; } + + /// + /// TODO + /// + public string? charge_user_id { get; set; } + + /// + /// TODO + /// + public string? report_content { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentDocument.cs index 8761506d..af53cc39 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentDocument.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_document")] +public partial class EqpSeriousAccidentDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_document")] - public partial class EqpSeriousAccidentDocument + public EqpSeriousAccidentDocument() { - public EqpSeriousAccidentDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int from_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? serious_accident_id { get; set; } + + /// + /// TODO + /// + public int from_type { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentEquip.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentEquip.cs index e445f104..b0d72978 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentEquip.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentEquip.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_equip")] +public partial class EqpSeriousAccidentEquip : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_equip")] - public partial class EqpSeriousAccidentEquip + public EqpSeriousAccidentEquip() { - public EqpSeriousAccidentEquip(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_report_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_report_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentMeasures.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentMeasures.cs index e1d34238..be0097cd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentMeasures.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentMeasures.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_measures")] +public partial class EqpSeriousAccidentMeasures : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_measures")] - public partial class EqpSeriousAccidentMeasures + public EqpSeriousAccidentMeasures() { - public EqpSeriousAccidentMeasures(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_analyze_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? decribe {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? serious_accident_analyze_id { get; set; } + + /// + /// TODO + /// + public string? decribe { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentPsn.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentPsn.cs index e28425b8..81720e21 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentPsn.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentPsn.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_psn")] +public partial class EqpSeriousAccidentPsn : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_psn")] - public partial class EqpSeriousAccidentPsn + public EqpSeriousAccidentPsn() { - public EqpSeriousAccidentPsn(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? serious_accident_report_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? age {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? type_work {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? work_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? serious_accident_report_id { get; set; } + + /// + /// TODO + /// + public string? user_id { get; set; } + + /// + /// TODO + /// + public int? age { get; set; } + + /// + /// TODO + /// + public string? type_work { get; set; } + + /// + /// TODO + /// + public int? work_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentReport.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentReport.cs index 14cd59d8..52776a41 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentReport.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSeriousAccidentReport.cs @@ -1,378 +1,267 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_serious_accident_report")] +public partial class EqpSeriousAccidentReport : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_serious_accident_report")] - public partial class EqpSeriousAccidentReport + public EqpSeriousAccidentReport() { - public EqpSeriousAccidentReport(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accident_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accident_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? accident_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? accident_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? organization_units_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? oper_department {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? audit_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? audit_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_content {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int accident_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_complete {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? meeting_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? meeting_local {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? declare_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int ismeeting {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int accident_itype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? fault_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? estimation {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? injuries {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? loss_location {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pollution_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? audit_charge_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_cycle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? environ_poll {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? insurance_option {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_judgment {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? accident_code { get; set; } + + /// + /// TODO + /// + public string? accident_name { get; set; } + + /// + /// TODO + /// + public string? accident_type { get; set; } + + /// + /// TODO + /// + public DateTime? accident_time { get; set; } + + /// + /// TODO + /// + public string? organization_units_id { get; set; } + + /// + /// TODO + /// + public string? oper_department { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public int? audit_result { get; set; } + + /// + /// TODO + /// + public string? audit_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? audit_time { get; set; } + + /// + /// TODO + /// + public string? audit_content { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public int accident_level { get; set; } + + /// + /// TODO + /// + public int is_complete { get; set; } + + /// + /// TODO + /// + public DateTime? meeting_time { get; set; } + + /// + /// TODO + /// + public string? meeting_local { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? declare_code { get; set; } + + /// + /// TODO + /// + public int ismeeting { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public int accident_itype { get; set; } + + /// + /// TODO + /// + public string? fault_code { get; set; } + + /// + /// TODO + /// + public string? estimation { get; set; } + + /// + /// TODO + /// + public string? injuries { get; set; } + + /// + /// TODO + /// + public string? loss_location { get; set; } + + /// + /// TODO + /// + public string? pollution_level { get; set; } + + /// + /// TODO + /// + public string? audit_charge_user_id { get; set; } + + /// + /// TODO + /// + public string? check_cycle { get; set; } + + /// + /// TODO + /// + public string? environ_poll { get; set; } + + /// + /// TODO + /// + public string? insurance_option { get; set; } + + /// + /// TODO + /// + public int? is_judgment { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCertificate.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCertificate.cs index 38d605d2..51923390 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCertificate.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCertificate.cs @@ -1,245 +1,172 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_certificate")] +public partial class EqpSpecialEquipCertificate : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_certificate")] - public partial class EqpSpecialEquipCertificate + public EqpSpecialEquipCertificate() { - public EqpSpecialEquipCertificate(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? special_equip_info_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? check_circle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int check_circle_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int warm_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? warn_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? next_check_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? special_equip_info_id { get; set; } + + /// + /// TODO + /// + public string? license_code { get; set; } + + /// + /// TODO + /// + public string? license_name { get; set; } + + /// + /// TODO + /// + public int? check_circle { get; set; } + + /// + /// TODO + /// + public int check_circle_unit { get; set; } + + /// + /// TODO + /// + public DateTime? start_time { get; set; } + + /// + /// TODO + /// + public DateTime? end_time { get; set; } + + /// + /// TODO + /// + public int warm_time { get; set; } + + /// + /// TODO + /// + public int? warn_unit { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public DateTime? next_check_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlan.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlan.cs index 0261b8be..17031830 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlan.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlan.cs @@ -1,259 +1,182 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_check_plan")] +public partial class EqpSpecialEquipCheckPlan : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_check_plan")] - public partial class EqpSpecialEquipCheckPlan + public EqpSpecialEquipCheckPlan() { - public EqpSpecialEquipCheckPlan(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? special_equip_info_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? check_circle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int check_circle_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int warm_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? warn_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? next_check_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_push {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? push_post_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? special_equip_info_id { get; set; } + + /// + /// TODO + /// + public string? license_code { get; set; } + + /// + /// TODO + /// + public string? license_name { get; set; } + + /// + /// TODO + /// + public int? check_circle { get; set; } + + /// + /// TODO + /// + public int check_circle_unit { get; set; } + + /// + /// TODO + /// + public DateTime? start_time { get; set; } + + /// + /// TODO + /// + public DateTime? end_time { get; set; } + + /// + /// TODO + /// + public int warm_time { get; set; } + + /// + /// TODO + /// + public int? warn_unit { get; set; } + + /// + /// TODO + /// + public DateTime? next_check_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public int? is_push { get; set; } + + /// + /// TODO + /// + public string? push_post_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlanTest.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlanTest.cs index 862596aa..95f99fb7 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlanTest.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckPlanTest.cs @@ -1,90 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_check_plan_test")] +public partial class EqpSpecialEquipCheckPlanTest : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_check_plan_test")] - public partial class EqpSpecialEquipCheckPlanTest + public EqpSpecialEquipCheckPlanTest() { - public EqpSpecialEquipCheckPlanTest(){ - - - } - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int? ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? check_circle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? warm_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? next_check_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 排序 + /// + public int? ordinal { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? license_name { get; set; } + + /// + /// TODO + /// + public int? check_circle { get; set; } + + /// + /// TODO + /// + public DateTime? start_time { get; set; } + + /// + /// TODO + /// + public DateTime? end_time { get; set; } + + /// + /// TODO + /// + public int? warm_time { get; set; } + + /// + /// TODO + /// + public DateTime? next_check_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckRecord.cs index da0484e9..0bfb5557 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipCheckRecord.cs @@ -1,308 +1,217 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_check_record")] +public partial class EqpSpecialEquipCheckRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_check_record")] - public partial class EqpSpecialEquipCheckRecord + public EqpSpecialEquipCheckRecord() { - public EqpSpecialEquipCheckRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? special_equip_info_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? oper_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? get_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? check_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? warm_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? warn_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? next_check_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? license_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? ins_status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? after_send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_after_send {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? special_equip_info_id { get; set; } + + /// + /// TODO + /// + public string? license_code { get; set; } + + /// + /// TODO + /// + public string? oper_user_id { get; set; } + + /// + /// TODO + /// + public DateTime? send_time { get; set; } + + /// + /// TODO + /// + public DateTime? get_time { get; set; } + + /// + /// TODO + /// + public int? check_result { get; set; } + + /// + /// TODO + /// + public int? warm_time { get; set; } + + /// + /// TODO + /// + public int? warn_unit { get; set; } + + /// + /// TODO + /// + public DateTime? start_time { get; set; } + + /// + /// TODO + /// + public DateTime? end_time { get; set; } + + /// + /// TODO + /// + public DateTime? next_check_time { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? license_name { get; set; } + + /// + /// TODO + /// + public string? license_id { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public int? ins_status { get; set; } + + /// + /// TODO + /// + public int? is_send { get; set; } + + /// + /// TODO + /// + public DateTime? send_date_time { get; set; } + + /// + /// TODO + /// + public string? send_id { get; set; } + + /// + /// TODO + /// + public DateTime? after_send_date_time { get; set; } + + /// + /// TODO + /// + public int? is_after_send { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipGroup.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipGroup.cs index 0355ce82..303b0139 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipGroup.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipGroup.cs @@ -1,371 +1,262 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_group")] +public partial class EqpSpecialEquipGroup : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_group")] - public partial class EqpSpecialEquipGroup + public EqpSpecialEquipGroup() { - public EqpSpecialEquipGroup(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? special_equip_info_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime manufactor_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime use_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int life_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_company_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? urgent_tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? register {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? register_license_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_rigister_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? nameplate_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_organization {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? medium {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pipe_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pipe_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_diameter {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_thickness {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_length {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_pressure {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_temperature {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? bar_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? special_equip_info_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public string? manufactor { get; set; } + + /// + /// TODO + /// + public string? manufactor_code { get; set; } + + /// + /// TODO + /// + public DateTime manufactor_date { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public DateTime use_date { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public int life_time { get; set; } + + /// + /// TODO + /// + public string? maintenance_company_id { get; set; } + + /// + /// TODO + /// + public string? urgent_tel { get; set; } + + /// + /// TODO + /// + public string? register { get; set; } + + /// + /// TODO + /// + public string? register_license_code { get; set; } + + /// + /// TODO + /// + public string? equip_rigister_code { get; set; } + + /// + /// TODO + /// + public string? nameplate_code { get; set; } + + /// + /// TODO + /// + public string? check_organization { get; set; } + + /// + /// TODO + /// + public string? use_department_id { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public string? medium { get; set; } + + /// + /// TODO + /// + public string? pipe_code { get; set; } + + /// + /// TODO + /// + public string? pipe_level { get; set; } + + /// + /// TODO + /// + public double pipe_diameter { get; set; } + + /// + /// TODO + /// + public double pipe_thickness { get; set; } + + /// + /// TODO + /// + public double pipe_length { get; set; } + + /// + /// TODO + /// + public double pipe_pressure { get; set; } + + /// + /// TODO + /// + public double pipe_temperature { get; set; } + + /// + /// TODO + /// + public string? bar_code { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfo.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfo.cs index 1e680ae8..4e45caeb 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfo.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfo.cs @@ -1,413 +1,292 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_info")] +public partial class EqpSpecialEquipInfo : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_info")] - public partial class EqpSpecialEquipInfo + public EqpSpecialEquipInfo() { - public EqpSpecialEquipInfo(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int life_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? urgent_tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? register {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? register_license_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_rigister_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? nameplate_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_organization {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? medium {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pipe_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pipe_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_diameter {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_thickness {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_length {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_pressure {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public double pipe_temperature {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? bar_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? classification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? install_data {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_company_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? manufactor_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? purchase_order_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equipment_to {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_archive {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? keeper_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public int life_time { get; set; } + + /// + /// TODO + /// + public string? urgent_tel { get; set; } + + /// + /// TODO + /// + public string? register { get; set; } + + /// + /// TODO + /// + public string? register_license_code { get; set; } + + /// + /// TODO + /// + public string? equip_rigister_code { get; set; } + + /// + /// TODO + /// + public string? nameplate_code { get; set; } + + /// + /// TODO + /// + public string? check_organization { get; set; } + + /// + /// TODO + /// + public string? medium { get; set; } + + /// + /// TODO + /// + public string? pipe_code { get; set; } + + /// + /// TODO + /// + public string? pipe_level { get; set; } + + /// + /// TODO + /// + public double pipe_diameter { get; set; } + + /// + /// TODO + /// + public double pipe_thickness { get; set; } + + /// + /// TODO + /// + public double pipe_length { get; set; } + + /// + /// TODO + /// + public double pipe_pressure { get; set; } + + /// + /// TODO + /// + public double pipe_temperature { get; set; } + + /// + /// TODO + /// + public string? bar_code { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? classification { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public DateTime? install_data { get; set; } + + /// + /// TODO + /// + public string? maintenance_company_id { get; set; } + + /// + /// TODO + /// + public string? manufactor { get; set; } + + /// + /// TODO + /// + public string? manufactor_code { get; set; } + + /// + /// TODO + /// + public DateTime? manufactor_date { get; set; } + + /// + /// TODO + /// + public string? purchase_order_code { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public DateTime? use_date { get; set; } + + /// + /// TODO + /// + public string? use_department_id { get; set; } + + /// + /// TODO + /// + public string? equipment_to { get; set; } + + /// + /// TODO + /// + public string? file_archive { get; set; } + + /// + /// TODO + /// + public string? keeper_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfoTest.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfoTest.cs index 9b794f54..dbac529b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfoTest.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpecialEquipInfoTest.cs @@ -1,223 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_special_equip_info_test")] +public partial class EqpSpecialEquipInfoTest : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_special_equip_info_test")] - public partial class EqpSpecialEquipInfoTest + public EqpSpecialEquipInfoTest() { - public EqpSpecialEquipInfoTest(){ - - - } - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int? ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? specification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? classification {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? manufactor_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? manufactor_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? use_date {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? life_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? maintenance_company_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? urgent_tel {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? register {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? register_license_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_rigister_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? nameplate_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? check_organization {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? medium {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pipe_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? pipe_level {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? pipe_diameter {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? pipe_thickness {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? pipe_length {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? pipe_pressure {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? pipe_temperature {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 排序 + /// + public int? ordinal { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? specification { get; set; } + + /// + /// TODO + /// + public string? classification { get; set; } + + /// + /// TODO + /// + public string? manufactor { get; set; } + + /// + /// TODO + /// + public string? manufactor_code { get; set; } + + /// + /// TODO + /// + public DateTime? manufactor_date { get; set; } + + /// + /// TODO + /// + public DateTime? use_date { get; set; } + + /// + /// TODO + /// + public int? life_time { get; set; } + + /// + /// TODO + /// + public string? maintenance_company_id { get; set; } + + /// + /// TODO + /// + public string? urgent_tel { get; set; } + + /// + /// TODO + /// + public string? register { get; set; } + + /// + /// TODO + /// + public string? register_license_code { get; set; } + + /// + /// TODO + /// + public string? equip_rigister_code { get; set; } + + /// + /// TODO + /// + public string? nameplate_code { get; set; } + + /// + /// TODO + /// + public string? check_organization { get; set; } + + /// + /// TODO + /// + public string? use_department_id { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public string? medium { get; set; } + + /// + /// TODO + /// + public string? pipe_code { get; set; } + + /// + /// TODO + /// + public string? pipe_level { get; set; } + + /// + /// TODO + /// + public double? pipe_diameter { get; set; } + + /// + /// TODO + /// + public double? pipe_thickness { get; set; } + + /// + /// TODO + /// + public double? pipe_length { get; set; } + + /// + /// TODO + /// + public double? pipe_pressure { get; set; } + + /// + /// TODO + /// + public double? pipe_temperature { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpelEqpCheckRedDoc.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpelEqpCheckRedDoc.cs index 17d9df68..5f8b7f83 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpelEqpCheckRedDoc.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpelEqpCheckRedDoc.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spel_eqp_check_red_doc")] +public partial class EqpSpelEqpCheckRedDoc : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spel_eqp_check_red_doc")] - public partial class EqpSpelEqpCheckRedDoc + public EqpSpelEqpCheckRedDoc() { - public EqpSpelEqpCheckRedDoc(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? special_equip_check_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? special_equip_check_record_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsItem.cs index 32e19617..086cad89 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsItem.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备点巡检项目 +/// +[SugarTable("eqp_spot_ins_item")] +public partial class EqpSpotInsItem : BaseEntity { - /// - ///设备点巡检项目 - /// - [SugarTable("eqp_spot_ins_item")] - public partial class EqpSpotInsItem + public EqpSpotInsItem() { - public EqpSpotInsItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code {get;set;} - - /// - /// Desc:名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? name {get;set;} - - /// - /// Desc:判断类型1数值2结果 - /// Default: - /// Nullable:False - /// - public string judge_type {get;set;} = string.Empty; - - /// - /// Desc:判断内容 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? judge_content {get;set;} - - /// - /// Desc:上限值 - /// Default: - /// Nullable:True - /// - public decimal? high_value {get;set;} - - /// - /// Desc:是否包含上限值 - /// Default: - /// Nullable:True - /// - public int? high_value_is_include {get;set;} - - /// - /// Desc:下限值 - /// Default: - /// Nullable:True - /// - public decimal? low_value {get;set;} - - /// - /// Desc:是否包含下限值 - /// Default: - /// Nullable:True - /// - public int? low_value_is_include {get;set;} - - /// - /// Desc:标准值 - /// Default: - /// Nullable:True - /// - public decimal? standard_value {get;set;} - - /// - /// Desc:单位id - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:点巡检方法 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? inspection_method {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:类型 1 点检 2巡检 - /// Default: - /// Nullable:False - /// - public string type {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 编码 + /// + public string? code { get; set; } + + /// + /// 名称 + /// + public string? name { get; set; } + + /// + /// 判断类型1数值2结果 + /// + public string judge_type { get; set; } = string.Empty; + + /// + /// 判断内容 + /// + public string? judge_content { get; set; } + + /// + /// 上限值 + /// + public decimal? high_value { get; set; } + + /// + /// 是否包含上限值 + /// + public int? high_value_is_include { get; set; } + + /// + /// 下限值 + /// + public decimal? low_value { get; set; } + + /// + /// 是否包含下限值 + /// + public int? low_value_is_include { get; set; } + + /// + /// 标准值 + /// + public decimal? standard_value { get; set; } + + /// + /// 单位id + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 点巡检方法 + /// + public string? inspection_method { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 类型 1 点检 2巡检 + /// + public string type { get; set; } = string.Empty; + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlan.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlan.cs index 72142f50..cc7f09dc 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlan.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlan.cs @@ -1,329 +1,232 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_plan")] +public partial class EqpSpotInsPlan : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_plan")] - public partial class EqpSpotInsPlan + public EqpSpotInsPlan() { - public EqpSpotInsPlan(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_post_info_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? charge_post {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_repeat {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_start {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_stop {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_cycle {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_cycle_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_delay_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int plan_run_notice_unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? repeat_post_info_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int repeat_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? next_execution_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? next_old_execution_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_before_or_after_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_post_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? plan_name { get; set; } + + /// + /// TODO + /// + public string? plan_code { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? send_post_info_user_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? charge_post { get; set; } + + /// + /// TODO + /// + public int is_repeat { get; set; } + + /// + /// TODO + /// + public int is_send { get; set; } + + /// + /// TODO + /// + public int is_start { get; set; } + + /// + /// TODO + /// + public int is_stop { get; set; } + + /// + /// TODO + /// + public int plan_cycle { get; set; } + + /// + /// TODO + /// + public int plan_cycle_unit { get; set; } + + /// + /// TODO + /// + public int? plan_delay { get; set; } + + /// + /// TODO + /// + public int plan_delay_unit { get; set; } + + /// + /// TODO + /// + public int? plan_run_notice { get; set; } + + /// + /// TODO + /// + public int plan_run_notice_unit { get; set; } + + /// + /// TODO + /// + public string? repeat_post_info_user_id { get; set; } + + /// + /// TODO + /// + public int repeat_result { get; set; } + + /// + /// TODO + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public DateTime? next_execution_time { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public DateTime? next_old_execution_time { get; set; } + + /// + /// TODO + /// + public int is_before_or_after_send { get; set; } + + /// + /// TODO + /// + public string? send_post_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlanItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlanItem.cs index e7c8d8eb..942cfc26 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlanItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsPlanItem.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_plan_item")] +public partial class EqpSpotInsPlanItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_plan_item")] - public partial class EqpSpotInsPlanItem + public EqpSpotInsPlanItem() { - public EqpSpotInsPlanItem(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_ins_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_inspection_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? spot_ins_plan_id { get; set; } + + /// + /// TODO + /// + public string? spot_inspection_item_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRatioRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRatioRecord.cs index 5a9fe770..c596ecea 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRatioRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRatioRecord.cs @@ -1,97 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_ratio_record")] +public partial class EqpSpotInsRatioRecord : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_ratio_record")] - public partial class EqpSpotInsRatioRecord + public EqpSpotInsRatioRecord() { - public EqpSpotInsRatioRecord(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - public int id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? depart_ment {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? year {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? month {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? day {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? spot_plan_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? spot_finsh_num {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_percent {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// TODO + /// + public string? depart_ment { get; set; } + + /// + /// TODO + /// + public int? year { get; set; } + + /// + /// TODO + /// + public int? month { get; set; } + + /// + /// TODO + /// + public int? day { get; set; } + + /// + /// TODO + /// + public int? spot_plan_num { get; set; } + + /// + /// TODO + /// + public int? spot_finsh_num { get; set; } + + /// + /// TODO + /// + public string? spot_percent { get; set; } + + /// + /// TODO + /// + public string? section_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs index d4d409ef..2de21636 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 点巡检执行记录子表 +/// +[SugarTable("eqp_spot_ins_record_d")] +public partial class EqpSpotInsRecordD : BaseEntity { - /// - ///点巡检执行记录子表 - /// - [SugarTable("eqp_spot_ins_record_d")] - public partial class EqpSpotInsRecordD + public EqpSpotInsRecordD() { - public EqpSpotInsRecordD(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:点巡检执行记录id - /// Default: - /// Nullable:False - /// - public string spot_ins_record_id {get;set;} = string.Empty; - - /// - /// Desc:点巡检项id - /// Default: - /// Nullable:False - /// - public string spot_ins_item_id {get;set;} = string.Empty; - - /// - /// Desc:编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code {get;set;} - - /// - /// Desc:名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? name {get;set;} - - /// - /// Desc:判断类型 - /// Default: - /// Nullable:False - /// - public string judge_type {get;set;} = string.Empty; - - /// - /// Desc:判断内容 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? judge_content {get;set;} - - /// - /// Desc:上限值 - /// Default: - /// Nullable:True - /// - public decimal? high_value {get;set;} - - /// - /// Desc:是否包含上限值 - /// Default: - /// Nullable:True - /// - public int? high_value_is_include {get;set;} - - /// - /// Desc:下限值 - /// Default: - /// Nullable:True - /// - public decimal? low_value {get;set;} - - /// - /// Desc:是否包含下限值 - /// Default: - /// Nullable:True - /// - public int? low_value_is_include {get;set;} - - /// - /// Desc:标准值 - /// Default: - /// Nullable:True - /// - public decimal? standard_value {get;set;} - - /// - /// Desc:单位id - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:点巡检方法 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? inspection_method {get;set;} - - /// - /// Desc:结果 1 通过 2 不通过 - /// Default: - /// Nullable:True - /// - public string? result {get;set;} - - /// - /// Desc:实际测量值 - /// Default: - /// Nullable:True - /// - public double? real_value {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public long ordinal {get;set;} - - /// - /// Desc:点巡检设备模板id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? spot_ins_tem_equip_id {get;set;} - - /// - /// Desc:是否通过 - /// Default: - /// Nullable:True - /// - public string? is_pass {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 点巡检执行记录id + /// + public string spot_ins_record_id { get; set; } = string.Empty; + + /// + /// 点巡检项id + /// + public string spot_ins_item_id { get; set; } = string.Empty; + + /// + /// 编码 + /// + public string? code { get; set; } + + /// + /// 名称 + /// + public string? name { get; set; } + + /// + /// 判断类型 + /// + public string judge_type { get; set; } = string.Empty; + + /// + /// 判断内容 + /// + public string? judge_content { get; set; } + + /// + /// 上限值 + /// + public decimal? high_value { get; set; } + + /// + /// 是否包含上限值 + /// + public int? high_value_is_include { get; set; } + + /// + /// 下限值 + /// + public decimal? low_value { get; set; } + + /// + /// 是否包含下限值 + /// + public int? low_value_is_include { get; set; } + + /// + /// 标准值 + /// + public decimal? standard_value { get; set; } + + /// + /// 单位id + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 点巡检方法 + /// + public string? inspection_method { get; set; } + + /// + /// 结果 1 通过 2 不通过 + /// + public string? result { get; set; } + + /// + /// 实际测量值 + /// + public double? real_value { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public long ordinal { get; set; } + + /// + /// 点巡检设备模板id + /// + public string? spot_ins_tem_equip_id { get; set; } + + /// + /// 是否通过 + /// + public string? is_pass { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDetailOld2.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDetailOld2.cs index 2db131ba..e5cc3752 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDetailOld2.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDetailOld2.cs @@ -1,308 +1,217 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_record_detail_old2")] +public partial class EqpSpotInsRecordDetailOld2 : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_record_detail_old2")] - public partial class EqpSpotInsRecordDetailOld2 + public EqpSpotInsRecordDetailOld2() { - public EqpSpotInsRecordDetailOld2(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_ins_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_inspection_item_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int judge_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? judge_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? high_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int high_value_is_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? low_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int low_value_is_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? standard_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? inspection_method {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? real_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? confirm_real_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_reason {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? confirm_result {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? spot_ins_record_id { get; set; } + + /// + /// TODO + /// + public string? spot_inspection_item_id { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public int judge_type { get; set; } + + /// + /// TODO + /// + public string? judge_content { get; set; } + + /// + /// TODO + /// + public double? high_value { get; set; } + + /// + /// TODO + /// + public int high_value_is_include { get; set; } + + /// + /// TODO + /// + public double? low_value { get; set; } + + /// + /// TODO + /// + public int low_value_is_include { get; set; } + + /// + /// TODO + /// + public double? standard_value { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public string? inspection_method { get; set; } + + /// + /// TODO + /// + public int? result { get; set; } + + /// + /// TODO + /// + public double? real_value { get; set; } + + /// + /// TODO + /// + public string? reason { get; set; } + + /// + /// TODO + /// + public int status { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public double? confirm_real_value { get; set; } + + /// + /// TODO + /// + public string? confirm_reason { get; set; } + + /// + /// TODO + /// + public int? confirm_result { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDocument.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDocument.cs index 2b24f510..d64fccc7 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDocument.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordDocument.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_record_document")] +public partial class EqpSpotInsRecordDocument : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_record_document")] - public partial class EqpSpotInsRecordDocument + public EqpSpotInsRecordDocument() { - public EqpSpotInsRecordDocument(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_ins_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? document_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_path {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int spot_ins_record_itype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? file_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? spot_ins_record_id { get; set; } + + /// + /// TODO + /// + public string? document_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// TODO + /// + public string? file_path { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public int spot_ins_record_itype { get; set; } + + /// + /// TODO + /// + public string? file_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs index bd4cfe81..38b993c6 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs @@ -1,224 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 点巡检执行记录表 +/// +[SugarTable("eqp_spot_ins_record_h")] +public partial class EqpSpotInsRecordH : BaseEntity { - /// - ///点巡检执行记录表 - /// - [SugarTable("eqp_spot_ins_record_h")] - public partial class EqpSpotInsRecordH + public EqpSpotInsRecordH() { - public EqpSpotInsRecordH(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:设备id - /// Default: - /// Nullable:False - /// - public string equip_id {get;set;} = string.Empty; - - /// - /// Desc:点巡检设备模板id - /// Default: - /// Nullable:False - /// - public string spot_ins_tem_equip_id {get;set;} = string.Empty; - - /// - /// Desc:结果1 合格2不合格 - /// Default: - /// Nullable:True - /// - public int? result {get;set;} - - /// - /// Desc:点巡检结果备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? result_remark {get;set;} - - /// - /// Desc:执行时间 - /// Default: - /// Nullable:True - /// - public DateTime? spot_record_date_time {get;set;} - - /// - /// Desc:状态 1待执行 2 待复核 3 已完成 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:执行人id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? spot_record_user_id {get;set;} - - /// - /// Desc:设备类型id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:不合格推送 - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - - /// - /// Desc:推送时间 - /// Default: - /// Nullable:True - /// - public DateTime? send_date_time {get;set;} - - /// - /// Desc:推送人id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? send_id {get;set;} - - /// - /// Desc:编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code {get;set;} - - /// - /// Desc:计划执行通知提前量 - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:计划执行通知提前量单位 1 小时 2 天 3 周 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? plan_run_notice_unit {get;set;} - - /// - /// Desc:执行滞后推送时间 - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:执行滞后推送时间单位 1 小时 2 天 3 周 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? plan_delay_unit {get;set;} - - /// - /// Desc:复核岗位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repeat_post_info_user_id {get;set;} - - /// - /// Desc:责任岗位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? send_post_info_user_id {get;set;} - - /// - /// Desc:是否复核 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? is_repeat {get;set;} - - /// - /// Desc:复核时间 - /// Default: - /// Nullable:True - /// - public DateTime? repeat_time {get;set;} - - /// - /// Desc:复核备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repeat_remark {get;set;} - - /// - /// Desc:复核人id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repeat_user_id {get;set;} - - /// - /// Desc:仅用于关联表字段查询用不存储数据 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? query_info {get;set;} - - /// - /// Desc:附件 - /// Default: - /// Nullable:True - /// - public string? attachment {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 设备id + /// + public string equip_id { get; set; } = string.Empty; + + /// + /// 点巡检设备模板id + /// + public string spot_ins_tem_equip_id { get; set; } = string.Empty; + + /// + /// 结果1 合格2不合格 + /// + public string? result { get; set; } + + /// + /// 点巡检结果备注 + /// + public string? result_remark { get; set; } + + /// + /// 执行时间 + /// + public DateTime? spot_record_date_time { get; set; } + + /// + /// 状态 1待执行 2 待复核 3 已完成 + /// + public string? status { get; set; } + + /// + /// 执行人id + /// + public string? spot_record_user_id { get; set; } + + /// + /// 设备类型id + /// + public string? equip_type_id { get; set; } + + /// + /// 不合格推送 + /// + public int? is_send { get; set; } + + /// + /// 推送时间 + /// + public DateTime? send_date_time { get; set; } + + /// + /// 推送人id + /// + public string? send_id { get; set; } + + /// + /// 编码 + /// + public string? code { get; set; } + + /// + /// 计划执行通知提前量 + /// + public int? plan_run_notice { get; set; } + + /// + /// 计划执行通知提前量单位 1 小时 2 天 3 周 + /// + public string? plan_run_notice_unit { get; set; } + + /// + /// 执行滞后推送时间 + /// + public int? plan_delay { get; set; } + + /// + /// 执行滞后推送时间单位 1 小时 2 天 3 周 + /// + public string? plan_delay_unit { get; set; } + + /// + /// 复核岗位id + /// + public string? repeat_post_info_user_id { get; set; } + + /// + /// 责任岗位id + /// + public string? send_post_info_user_id { get; set; } + + /// + /// 是否复核 + /// + public string? is_repeat { get; set; } + + /// + /// 复核时间 + /// + public DateTime? repeat_time { get; set; } + + /// + /// 复核备注 + /// + public string? repeat_remark { get; set; } + + /// + /// 复核人id + /// + public string? repeat_user_id { get; set; } + + /// + /// 仅用于关联表字段查询用不存储数据 + /// + public string? query_info { get; set; } + + /// + /// 附件 + /// + public string? attachment { get; set; } + + /// + /// 复核结果 + /// + public string? repeat_result { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordOld.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordOld.cs index b9d843bf..722c9068 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordOld.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordOld.cs @@ -1,294 +1,207 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_record_old")] +public partial class EqpSpotInsRecordOld : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_record_old")] - public partial class EqpSpotInsRecordOld + public EqpSpotInsRecordOld() { - public EqpSpotInsRecordOld(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_ins_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int confirm_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? confirm_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime plan_spot_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? spot_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_record_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? after_send_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? is_after_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? receive_user_name {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? spot_ins_plan_id { get; set; } + + /// + /// TODO + /// + public int result { get; set; } + + /// + /// TODO + /// + public int confirm_result { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// TODO + /// + public string? confirm_remark { get; set; } + + /// + /// TODO + /// + public DateTime? confirm_date_time { get; set; } + + /// + /// TODO + /// + public DateTime plan_spot_record_date_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public DateTime? spot_record_date_time { get; set; } + + /// + /// TODO + /// + public string? status { get; set; } + + /// + /// TODO + /// + public string? confirm_user_id { get; set; } + + /// + /// TODO + /// + public string? spot_record_user_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public int? is_send { get; set; } + + /// + /// TODO + /// + public DateTime? send_date_time { get; set; } + + /// + /// TODO + /// + public string? send_id { get; set; } + + /// + /// TODO + /// + public DateTime? after_send_date_time { get; set; } + + /// + /// TODO + /// + public int? is_after_send { get; set; } + + /// + /// TODO + /// + public string? receive_user_name { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordRationLog.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordRationLog.cs index 49c3f930..496794b4 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordRationLog.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordRationLog.cs @@ -1,238 +1,167 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_record_ration_log")] +public partial class EqpSpotInsRecordRationLog : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_record_ration_log")] - public partial class EqpSpotInsRecordRationLog + public EqpSpotInsRecordRationLog() { - public EqpSpotInsRecordRationLog(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? use_department_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? section_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? address {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_ins_plan_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? plan_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? result_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int confirm_result {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_result_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? confirm_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime plan_spot_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? spot_record_date_time {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? status_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? confirm_user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_record_user_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_record_user_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? equip_code { get; set; } + + /// + /// TODO + /// + public string? equip_name { get; set; } + + /// + /// TODO + /// + public string? use_department_id { get; set; } + + /// + /// TODO + /// + public string? use_department_name { get; set; } + + /// + /// TODO + /// + public string? section_id { get; set; } + + /// + /// TODO + /// + public string? section_name { get; set; } + + /// + /// TODO + /// + public string? address { get; set; } + + /// + /// TODO + /// + public string? spot_ins_plan_id { get; set; } + + /// + /// TODO + /// + public string? plan_code { get; set; } + + /// + /// TODO + /// + public string? plan_name { get; set; } + + /// + /// TODO + /// + public int result { get; set; } + + /// + /// TODO + /// + public string? result_name { get; set; } + + /// + /// TODO + /// + public int confirm_result { get; set; } + + /// + /// TODO + /// + public string? confirm_result_name { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// TODO + /// + public string? confirm_remark { get; set; } + + /// + /// TODO + /// + public DateTime? confirm_date_time { get; set; } + + /// + /// TODO + /// + public DateTime plan_spot_record_date_time { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public DateTime? spot_record_date_time { get; set; } + + /// + /// TODO + /// + public string? status { get; set; } + + /// + /// TODO + /// + public string? status_name { get; set; } + + /// + /// TODO + /// + public string? confirm_user_id { get; set; } + + /// + /// TODO + /// + public string? confirm_user_name { get; set; } + + /// + /// TODO + /// + public string? spot_record_user_id { get; set; } + + /// + /// TODO + /// + public string? spot_record_user_name { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordSendPost.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordSendPost.cs index 36ee2381..6f32bc24 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordSendPost.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordSendPost.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_ins_record_send_post")] +public partial class EqpSpotInsRecordSendPost : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_ins_record_send_post")] - public partial class EqpSpotInsRecordSendPost + public EqpSpotInsRecordSendPost() { - public EqpSpotInsRecordSendPost(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? spot_ins_record_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? send_post {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_send {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// TODO + /// + public string? spot_ins_record_id { get; set; } + + /// + /// TODO + /// + public string? send_post { get; set; } + + /// + /// TODO + /// + public int is_send { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs index 209a9e7e..62c33211 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs @@ -1,42 +1,27 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 点巡检模板子表 +/// +[SugarTable("eqp_spot_ins_tem_d")] +public partial class EqpSpotInsTemD : BaseEntity { - /// - ///点巡检模板子表 - /// - [SugarTable("eqp_spot_ins_tem_d")] - public partial class EqpSpotInsTemD + public EqpSpotInsTemD() { - public EqpSpotInsTemD(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:模板id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? spot_ins_tem_id {get;set;} - - /// - /// Desc:点巡检项id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? spot_ins_item_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 模板id + /// + public string? spot_ins_tem_id { get; set; } + + /// + /// 点巡检项id + /// + public string? spot_ins_item_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipD.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipD.cs index 9154da9f..77c1dbd0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipD.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipD.cs @@ -1,42 +1,27 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 点巡检设备模板子表 +/// +[SugarTable("eqp_spot_ins_tem_equip_d")] +public partial class EqpSpotInsTemEquipD : BaseEntity { - /// - ///点巡检设备模板子表 - /// - [SugarTable("eqp_spot_ins_tem_equip_d")] - public partial class EqpSpotInsTemEquipD + public EqpSpotInsTemEquipD() { - public EqpSpotInsTemEquipD(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:设备模板id - /// Default: - /// Nullable:False - /// - public string spot_ins_tem_equip_id {get;set;} = string.Empty; - - /// - /// Desc:点巡检项id - /// Default: - /// Nullable:False - /// - public string spot_ins_item_id {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 设备模板id + /// + public string spot_ins_tem_equip_id { get; set; } = string.Empty; + + /// + /// 点巡检项id + /// + public string spot_ins_item_id { get; set; } = string.Empty; + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipH.cs index d74dbccd..8e63be09 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipH.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 点巡检设备模板表 +/// +[SugarTable("eqp_spot_ins_tem_equip_h")] +public partial class EqpSpotInsTemEquipH : BaseEntity { - /// - ///点巡检设备模板表 - /// - [SugarTable("eqp_spot_ins_tem_equip_h")] - public partial class EqpSpotInsTemEquipH + public EqpSpotInsTemEquipH() { - public EqpSpotInsTemEquipH(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:点巡检模板id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? spot_ins_tem_id {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? equip_id {get;set;} - - /// - /// Desc:TODO - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:编码 - /// Default: - /// Nullable:False - /// - public string code {get;set;} = string.Empty; - - /// - /// Desc:名称 - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:周期 - /// Default: - /// Nullable:False - /// - public decimal plan_cycle {get;set;} - - /// - /// Desc:周期方式 1 单次 2 循环 - /// Default: - /// Nullable:False - /// - public string plan_cycle_unit {get;set;} = string.Empty; - - /// - /// Desc:计划执行通知提前量 - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:计划执行通知提前量单位 1 小时 2 天 3 周 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? plan_run_notice_unit {get;set;} - - /// - /// Desc:执行滞后推送时间 - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:执行滞后推送时间单位 1 小时 2 天 3 周 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? plan_delay_unit {get;set;} - - /// - /// Desc:启用时间 - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public string is_start {get;set;} = string.Empty; - - /// - /// Desc:是否复核 - /// Default: - /// Nullable:False - /// - public string is_repeat {get;set;} = string.Empty; - - /// - /// Desc:复核岗位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repeat_post_info_user_id {get;set;} - - /// - /// Desc:责任岗位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? send_post_info_user_id {get;set;} - - /// - /// Desc:不合格推送 0 不推送 1 推送 - /// Default: - /// Nullable:True - /// - public int? is_send {get;set;} - - /// - /// Desc:推送人id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? send_post_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 点巡检模板id + /// + public string? spot_ins_tem_id { get; set; } + + /// + /// TODO + /// + public string? equip_id { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 编码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 周期 + /// + public decimal plan_cycle { get; set; } + + /// + /// 周期方式 1 单次 2 循环 + /// + public string plan_cycle_unit { get; set; } = string.Empty; + + /// + /// 计划执行通知提前量 + /// + public int? plan_run_notice { get; set; } + + /// + /// 计划执行通知提前量单位 1 小时 2 天 3 周 + /// + public string? plan_run_notice_unit { get; set; } + + /// + /// 执行滞后推送时间 + /// + public int? plan_delay { get; set; } + + /// + /// 执行滞后推送时间单位 1 小时 2 天 3 周 + /// + public string? plan_delay_unit { get; set; } + + /// + /// 启用时间 + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// 是否启用 + /// + public string is_start { get; set; } = string.Empty; + + /// + /// 是否复核 + /// + public string is_repeat { get; set; } = string.Empty; + + /// + /// 复核岗位id + /// + public string? repeat_post_info_user_id { get; set; } + + /// + /// 责任岗位id + /// + public string? send_post_info_user_id { get; set; } + + /// + /// 不合格推送 0 不推送 1 推送 + /// + public int? is_send { get; set; } + + /// + /// 推送人id + /// + public string? send_post_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs index 44a3c111..bd5b27af 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 点巡检模板 +/// +[SugarTable("eqp_spot_ins_tem_h")] +public partial class EqpSpotInsTemH : BaseEntity { - /// - ///点巡检模板 - /// - [SugarTable("eqp_spot_ins_tem_h")] - public partial class EqpSpotInsTemH + public EqpSpotInsTemH() { - public EqpSpotInsTemH(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:设备类型id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code {get;set;} - - /// - /// Desc:名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? name {get;set;} - - /// - /// Desc:周期 - /// Default: - /// Nullable:False - /// - public decimal plan_cycle {get;set;} - - /// - /// Desc:周期方式 1 单次 2 循环 - /// Default: - /// Nullable:False - /// - public string plan_cycle_unit {get;set;} = string.Empty; - - /// - /// Desc:计划执行通知提前量 - /// Default: - /// Nullable:True - /// - public int? plan_run_notice {get;set;} - - /// - /// Desc:计划执行通知提前量单位 1 小时 2 天 3 周 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? plan_run_notice_unit {get;set;} - - /// - /// Desc:执行滞后推送时间 - /// Default: - /// Nullable:True - /// - public int? plan_delay {get;set;} - - /// - /// Desc:执行滞后推送时间单位 1 小时 2 天 3 周 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? plan_delay_unit {get;set;} - - /// - /// Desc:启用时间 - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int is_start {get;set;} - - /// - /// Desc:是否复核 - /// Default: - /// Nullable:False - /// - public int is_repeat {get;set;} - - /// - /// Desc:复核岗位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repeat_post_info_user_id {get;set;} - - /// - /// Desc:责任岗位id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? send_post_info_user_id {get;set;} - - /// - /// Desc:不合格推送 0 不推送 1 推送 - /// Default: - /// Nullable:False - /// - public int is_send {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:推送人id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? send_post_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 设备类型id + /// + public string? equip_type_id { get; set; } + + /// + /// 编码 + /// + public string? code { get; set; } + + /// + /// 名称 + /// + public string? name { get; set; } + + /// + /// 周期 + /// + public decimal plan_cycle { get; set; } + + /// + /// 周期方式 1 单次 2 循环 + /// + public string plan_cycle_unit { get; set; } = string.Empty; + + /// + /// 计划执行通知提前量 + /// + public int? plan_run_notice { get; set; } + + /// + /// 计划执行通知提前量单位 1 小时 2 天 3 周 + /// + public string? plan_run_notice_unit { get; set; } + + /// + /// 执行滞后推送时间 + /// + public int? plan_delay { get; set; } + + /// + /// 执行滞后推送时间单位 1 小时 2 天 3 周 + /// + public string? plan_delay_unit { get; set; } + + /// + /// 启用时间 + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// 是否启用 + /// + public int is_start { get; set; } + + /// + /// 是否复核 + /// + public int is_repeat { get; set; } + + /// + /// 复核岗位id + /// + public string? repeat_post_info_user_id { get; set; } + + /// + /// 责任岗位id + /// + public string? send_post_info_user_id { get; set; } + + /// + /// 不合格推送 0 不推送 1 推送 + /// + public int is_send { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 推送人id + /// + public string? send_post_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInspectionItemDel.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInspectionItemDel.cs index d2627c8b..a368c9f5 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInspectionItemDel.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInspectionItemDel.cs @@ -1,251 +1,177 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_spot_inspection_item_del")] +public partial class EqpSpotInspectionItemDel : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_spot_inspection_item_del")] - public partial class EqpSpotInspectionItemDel + public EqpSpotInspectionItemDel() { - public EqpSpotInspectionItemDel(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? equip_type_id {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? item_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int judge_type {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? judge_content {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? high_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int high_value_is_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? low_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int low_value_is_include {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public double? standard_value {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? inspection_method {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? equip_type_id { get; set; } + + /// + /// TODO + /// + public string? item_code { get; set; } + + /// + /// TODO + /// + public string? item_name { get; set; } + + /// + /// TODO + /// + public int judge_type { get; set; } + + /// + /// TODO + /// + public string? judge_content { get; set; } + + /// + /// TODO + /// + public double? high_value { get; set; } + + /// + /// TODO + /// + public int high_value_is_include { get; set; } + + /// + /// TODO + /// + public double? low_value { get; set; } + + /// + /// TODO + /// + public int low_value_is_include { get; set; } + + /// + /// TODO + /// + public double? standard_value { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public string? inspection_method { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpStrategy.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpStrategy.cs index 80961a18..556ec6ec 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpStrategy.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpStrategy.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("eqp_strategy")] +public partial class EqpStrategy : BaseEntity { - /// - ///TODO - /// - [SugarTable("eqp_strategy")] - public partial class EqpStrategy + public EqpStrategy() { - public EqpStrategy(){ - - - } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? strategy_name {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? strategy_code {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int is_default {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:True - /// - public string? descrip {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:排序 - /// Default: - /// Nullable:False - /// - public int ordinal {get;set;} - - /// - /// Desc:是否启用 - /// Default: - /// Nullable:False - /// - public int enabled {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend01 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend02 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend03 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend04 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend05 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend06 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend07 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend08 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend09 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? extend10 {get;set;} - - /// - /// Desc:删除用户 - /// Default: - /// Nullable:True - /// - public string? delete_id {get;set;} - - /// - /// Desc:删除时间 - /// Default: - /// Nullable:True - /// - public DateTime? delete_time {get;set;} - - /// - /// Desc:删除标志 - /// Default: - /// Nullable:False - /// - public short deleted {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// TODO + /// + public string? strategy_name { get; set; } + + /// + /// TODO + /// + public string? strategy_code { get; set; } + + /// + /// TODO + /// + public int is_default { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// 排序 + /// + public int ordinal { get; set; } + + /// + /// 是否启用 + /// + public int enabled { get; set; } + + /// + /// TODO + /// + public string? extend01 { get; set; } + + /// + /// TODO + /// + public string? extend02 { get; set; } + + /// + /// TODO + /// + public string? extend03 { get; set; } + + /// + /// TODO + /// + public string? extend04 { get; set; } + + /// + /// TODO + /// + public string? extend05 { get; set; } + + /// + /// TODO + /// + public string? extend06 { get; set; } + + /// + /// TODO + /// + public string? extend07 { get; set; } + + /// + /// TODO + /// + public string? extend08 { get; set; } + + /// + /// TODO + /// + public string? extend09 { get; set; } + + /// + /// TODO + /// + public string? extend10 { get; set; } + + /// + /// 删除用户 + /// + public string? delete_id { get; set; } + + /// + /// 删除时间 + /// + public DateTime? delete_time { get; set; } + + /// + /// 删除标志 + /// + public short deleted { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs index 9c90f8a6..86893b44 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_check_item")] +public partial class ToolCheckItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_check_item")] - public partial class ToolCheckItem + public ToolCheckItem() { - public ToolCheckItem(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string qctype {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string itemcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string itemname {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? resulttype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int judgetype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limitlow {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limithigh {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? standard {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string qctype { get; set; } = string.Empty; + + /// + /// TODO + /// + public int seq { get; set; } + + /// + /// TODO + /// + public string itemcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string itemname { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? resulttype { get; set; } + + /// + /// TODO + /// + public int judgetype { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public decimal? limitlow { get; set; } + + /// + /// TODO + /// + public decimal? limithigh { get; set; } + + /// + /// TODO + /// + public decimal? standard { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs index a8fb3621..0ced1e8c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_check_period")] +public partial class ToolCheckPeriod : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_check_period")] - public partial class ToolCheckPeriod + public ToolCheckPeriod() { - public ToolCheckPeriod(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tpcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tpname {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int tpseq {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int tpbtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int tpetime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string tpcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string tpname { get; set; } = string.Empty; + + /// + /// TODO + /// + public int tpseq { get; set; } + + /// + /// TODO + /// + public int tpbtime { get; set; } + + /// + /// TODO + /// + public int tpetime { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs index 70caa0a5..d1f421f4 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_check_result")] +public partial class ToolCheckResult : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_check_result")] - public partial class ToolCheckResult + public ToolCheckResult() { - public ToolCheckResult(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string toolcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime checkdate {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tpcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string result {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string toolcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public DateTime checkdate { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public string tpcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string result { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs index cf9fb105..8791fa58 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_check_result_detail")] +public partial class ToolCheckResultDetail : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_check_result_detail")] - public partial class ToolCheckResultDetail + public ToolCheckResultDetail() { - public ToolCheckResultDetail(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public char checkresultid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string checkitemcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string checkitemname {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? resulttype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int judgetype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limitlow {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limithigh {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? standard {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? actual {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? resultcode {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public char checkresultid { get; set; } + + /// + /// TODO + /// + public int seq { get; set; } + + /// + /// TODO + /// + public string checkitemcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string checkitemname { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? resulttype { get; set; } + + /// + /// TODO + /// + public int judgetype { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public decimal? limitlow { get; set; } + + /// + /// TODO + /// + public decimal? limithigh { get; set; } + + /// + /// TODO + /// + public decimal? standard { get; set; } + + /// + /// TODO + /// + public string? actual { get; set; } + + /// + /// TODO + /// + public string? resultcode { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs index bcc83090..65b63c2c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_check_result_icon")] +public partial class ToolCheckResultIcon : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_check_result_icon")] - public partial class ToolCheckResultIcon + public ToolCheckResultIcon() { - public ToolCheckResultIcon(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string resultcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string resultname {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string icon {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int resulttype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string resultcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string resultname { get; set; } = string.Empty; + + /// + /// TODO + /// + public string icon { get; set; } = string.Empty; + + /// + /// TODO + /// + public int resulttype { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolLocation.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolLocation.cs index e7447746..f6a6e268 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolLocation.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolLocation.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 库位资料 +/// +[SugarTable("tool_location")] +public partial class ToolLocation : BaseEntity { - /// - ///库位资料 - /// - [SugarTable("tool_location")] - public partial class ToolLocation + public ToolLocation() { - public ToolLocation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:库位代码(库位编号唯一) - /// Default: - /// Nullable:False - /// - public string location_code {get;set;} = string.Empty; - - /// - /// Desc:货架ID - /// Default: - /// Nullable:False - /// - public string rack_id {get;set;} = string.Empty; - - /// - /// Desc:区域ID - /// Default: - /// Nullable:False - /// - public string region_id {get;set;} = string.Empty; - - /// - /// Desc:仓库ID - /// Default: - /// Nullable:False - /// - public string wh_id {get;set;} = string.Empty; - - /// - /// Desc:层数 - /// Default: - /// Nullable:False - /// - public int layers {get;set;} - - /// - /// Desc:位置序号 - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 库位代码(库位编号唯一) + /// + public string location_code { get; set; } = string.Empty; + + /// + /// 货架ID + /// + public string rack_id { get; set; } = string.Empty; + + /// + /// 区域ID + /// + public string region_id { get; set; } = string.Empty; + + /// + /// 仓库ID + /// + public string wh_id { get; set; } = string.Empty; + + /// + /// 层数 + /// + public int layers { get; set; } + + /// + /// 位置序号 + /// + public int seq { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainLog.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainLog.cs index 23805225..d4938738 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainLog.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainLog.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具保养记录 +/// +[SugarTable("tool_maintain_log")] +public partial class ToolMaintainLog : BaseEntity { - /// - ///工装工具保养记录 - /// - [SugarTable("tool_maintain_log")] - public partial class ToolMaintainLog + public ToolMaintainLog() { - public ToolMaintainLog(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工具代码 - /// Default: - /// Nullable:False - /// - public string tool_code {get;set;} = string.Empty; - - /// - /// Desc:保养内容 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? content {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工具代码 + /// + public string tool_code { get; set; } = string.Empty; + + /// + /// 保养内容 + /// + public string? content { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModel.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModel.cs index d767e05e..1e810879 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModel.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModel.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具型号 +/// +[SugarTable("tool_model")] +public partial class ToolModel : BaseEntity { - /// - ///工装工具型号 - /// - [SugarTable("tool_model")] - public partial class ToolModel + public ToolModel() { - public ToolModel(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:所属类型 - /// Default: - /// Nullable:False - /// - public string type_code {get;set;} = string.Empty; - - /// - /// Desc:型号代码 - /// Default: - /// Nullable:False - /// - public string model_code {get;set;} = string.Empty; - - /// - /// Desc:预警使用次数 - /// Default: - /// Nullable:True - /// - public int? warnuse_times {get;set;} - - /// - /// Desc:安全库存 - /// Default: - /// Nullable:True - /// - public int? safe_qty {get;set;} - - /// - /// Desc:需保养 - /// Default: - /// Nullable:False - /// - public int main_tenance {get;set;} - - /// - /// Desc:生产厂家 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_code {get;set;} - - /// - /// Desc:联系人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_name {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 所属类型 + /// + public string type_code { get; set; } = string.Empty; + + /// + /// 型号代码 + /// + public string model_code { get; set; } = string.Empty; + + /// + /// 预警使用次数 + /// + public int? warnuse_times { get; set; } + + /// + /// 安全库存 + /// + public int? safe_qty { get; set; } + + /// + /// 需保养 + /// + public int main_tenance { get; set; } + + /// + /// 生产厂家 + /// + public string? supplier_code { get; set; } + + /// + /// 联系人 + /// + public string? contact_name { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs index d4d2b399..1797a714 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs @@ -1,189 +1,133 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; +using Yitter.IdGenerator; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_model_check_item")] +public partial class ToolModelCheckItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_model_check_item")] - public partial class ToolModelCheckItem + public ToolModelCheckItem() { - public ToolModelCheckItem(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string toolmodel {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string checkitemcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string checkitemname {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? resulttype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int judgetype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limitlow {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limithigh {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? standard {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = YitIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string toolmodel { get; set; } = string.Empty; + + /// + /// TODO + /// + public int seq { get; set; } + + /// + /// TODO + /// + public string checkitemcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string checkitemname { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? resulttype { get; set; } + + /// + /// TODO + /// + public int judgetype { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public decimal? limitlow { get; set; } + + /// + /// TODO + /// + public decimal? limithigh { get; set; } + + /// + /// TODO + /// + public decimal? standard { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs index a101a58c..1898e13b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_model_check_period")] +public partial class ToolModelCheckPeriod : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_model_check_period")] - public partial class ToolModelCheckPeriod + public ToolModelCheckPeriod() { - public ToolModelCheckPeriod(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string toolmodel {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tpcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = Yitter.IdGenerator.YitIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string toolmodel { get; set; } = string.Empty; + + /// + /// TODO + /// + public string tpcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelEquip.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelEquip.cs index 1ef0ac7a..426d0e2b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelEquip.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelEquip.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具型号与设备绑定关系 +/// +[SugarTable("tool_model_equip")] +public partial class ToolModelEquip : BaseEntity { - /// - ///工装工具型号与设备绑定关系 - /// - [SugarTable("tool_model_equip")] - public partial class ToolModelEquip + public ToolModelEquip() { - public ToolModelEquip(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:型号代码 - /// Default: - /// Nullable:False - /// - public string model_code {get;set;} = string.Empty; - - /// - /// Desc:设备代码 - /// Default: - /// Nullable:False - /// - public string eqp_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 型号代码 + /// + public string model_code { get; set; } = string.Empty; + + /// + /// 设备代码 + /// + public string eqp_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelItem.cs index fee8cf67..a6859ae5 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelItem.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具型号与产品工序绑定关系 +/// +[SugarTable("tool_model_item")] +public partial class ToolModelItem : BaseEntity { - /// - ///工装工具型号与产品工序绑定关系 - /// - [SugarTable("tool_model_item")] - public partial class ToolModelItem + public ToolModelItem() { - public ToolModelItem(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:型号代码 - /// Default: - /// Nullable:False - /// - public string model_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_code {get;set;} - - /// - /// Desc:工艺路线版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_version {get;set;} - - /// - /// Desc:工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public int qty {get;set;} - - /// - /// Desc:树形 - /// Default: - /// Nullable:False - /// - public int pertimes {get;set;} - - /// - /// Desc:损失率 - /// Default: - /// Nullable:True - /// - public decimal? lossrate {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 型号代码 + /// + public string model_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string? route_code { get; set; } + + /// + /// 工艺路线版本 + /// + public string? route_version { get; set; } + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 数量 + /// + public int qty { get; set; } + + /// + /// 树形 + /// + public int pertimes { get; set; } + + /// + /// 损失率 + /// + public decimal? lossrate { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroup.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroup.cs index 7eca1d5f..7fb4057b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroup.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroup.cs @@ -1,63 +1,42 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具保养项目组 +/// +[SugarTable("tool_mold_maintain_group")] +public partial class ToolMoldMaintainGroup : BaseEntity { - /// - ///模具保养项目组 - /// - [SugarTable("tool_mold_maintain_group")] - public partial class ToolMoldMaintainGroup + public ToolMoldMaintainGroup() { - public ToolMoldMaintainGroup(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:项目组名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? name {get;set;} - - /// - /// Desc:保养类型 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? service_type {get;set;} - - /// - /// Desc:描述 - /// Default: - /// Nullable:False - /// - public string describe {get;set;} = string.Empty; - - /// - /// Desc:创建人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 项目组名称 + /// + public string? name { get; set; } + + /// + /// 保养类型 + /// + public string? service_type { get; set; } + + /// + /// 描述 + /// + public string? describe { get; set; } + + /// + /// 创建人 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupItem.cs index f1ec7a64..f9c6ffa0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupItem.cs @@ -1,32 +1,27 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具保养项目组与保养项关系 +/// +[SugarTable("tool_mold_maintain_group_item")] +public partial class ToolMoldMaintainGroupItem : BaseEntity { - /// - ///模具保养项目组与保养项关系 - /// - [SugarTable("tool_mold_maintain_group_item")] - public partial class ToolMoldMaintainGroupItem : BaseEntity + public ToolMoldMaintainGroupItem() { - - /// - /// Desc:项目组id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_group_id { get; set; } - - /// - /// Desc:保养项id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_id { get; set; } - + id = SnowflakeIdHelper.NextId(); } + /// + /// 项目组id + /// + public string item_group_id { get; set; } = string.Empty; + + /// + /// 保养项id + /// + public string item_id { get; set; } = string.Empty; + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupRelation.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupRelation.cs index c6b6c323..cad6f8e5 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupRelation.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupRelation.cs @@ -1,33 +1,27 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具保养组与磨具关联 +/// +[SugarTable("tool_mold_maintain_group_relation")] +public partial class ToolMoldMaintainGroupRelation : BaseEntity { - /// - ///模具保养组与磨具关联 - /// - [SugarTable("tool_mold_maintain_group_relation")] - public partial class ToolMoldMaintainGroupRelation :BaseEntity + public ToolMoldMaintainGroupRelation() { - - - /// - /// Desc:项目组Id - /// Default: - /// Nullable:False - /// - public string item_group_id {get;set;} = string.Empty; - - /// - /// Desc:模具Id - /// Default: - /// Nullable:False - /// - public string mold_id {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 项目组Id + /// + public string item_group_id { get; set; } = string.Empty; + + /// + /// 模具Id + /// + public string mold_id { get; set; } = string.Empty; + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItem.cs new file mode 100644 index 00000000..a661a5ec --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItem.cs @@ -0,0 +1,67 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具保养 +/// +[SugarTable("tool_mold_maintain_item")] +public partial class ToolMoldMaintainItem : BaseEntity +{ + public ToolMoldMaintainItem() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 项目 + /// + public string? name { get; set; } + + /// + /// 描述 + /// + public string? descrip { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 查看照片 + /// + public string? image { get; set; } + + /// + /// 扩展 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + +} diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs index 0edddd10..a25d6012 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs @@ -7,71 +7,72 @@ using System.Threading.Tasks; namespace Tnb.EquipMgr.Entities { using global::Tnb.Common.Contracts; - using JNPF.Common.Contracts; - using JNPF.Common.Security; - using SqlSugar; +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; +namespace Tnb.EquipMgr.Entities; + +/// +/// +/// +[SugarTable("tool_mold_maintain_plan")] +public partial class ToolMoldMaintainPlan : BaseEntity +{ + public ToolMoldMaintainPlan() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 计划单号 + /// + public string? plan_code { get; set; } /// - /// + /// 保养方式 /// - [SugarTable("tool_mold_maintain_plan")] - public partial class ToolMoldMaintainPlan : BaseEntity - { - public ToolMoldMaintainPlan() - { - id = SnowflakeIdHelper.NextId(); - } - /// - /// 计划单号 - /// - public string? plan_code { get; set; } + public string? mode { get; set; } - /// - /// 保养方式 - /// - public string? mode { get; set; } + /// + /// 计划状态 + /// + public string? status { get; set; } - /// - /// 计划状态 - /// - public string? status { get; set; } + /// + /// 计划开始时间 + /// + public DateTime? plan_start_date { get; set; } - /// - /// 计划开始时间 - /// - public DateTime? plan_start_date { get; set; } + /// + /// 计划完成时间 + /// + public DateTime? plan_end_date { get; set; } - /// - /// 计划完成时间 - /// - public DateTime? plan_end_date { get; set; } + /// + /// 备注 + /// + public string? remark { get; set; } - /// - /// 备注 - /// - public string? remark { get; set; } + /// + /// 制定人 + /// + public string? create_id { get; set; } - /// - /// 制定人 - /// - public string? create_id { get; set; } + /// + /// 制定时间 + /// + public DateTime? create_time { get; set; } - /// - /// 制定时间 - /// - public DateTime? create_time { get; set; } + /// + /// 修改人 + /// + public string? modify_id { get; set; } - /// - /// 修改人 - /// - public string? modify_id { get; set; } - - /// - /// 修改时间 - /// - public DateTime? modify_time { get; set; } - - } + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + +} } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlanRelation.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlanRelation.cs index 1034816d..5a305aac 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlanRelation.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlanRelation.cs @@ -1,35 +1,30 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// +/// +[SugarTable("tool_mold_maintain_plan_relation")] +public partial class ToolMoldMaintainPlanRelation : BaseEntity { + public ToolMoldMaintainPlanRelation() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 保养计划id + /// + public string maintain_plan_id { get; set; } = string.Empty; /// - /// + /// 模具Id /// - [SugarTable("tool_mold_maintain_plan_relation")] - public partial class ToolMoldMaintainPlanRelation : BaseEntity - { - public ToolMoldMaintainPlanRelation() - { - id = SnowflakeIdHelper.NextId(); - } - /// - /// 保养计划id - /// - public string maintain_plan_id { get; set; } = string.Empty; - - /// - /// 模具Id - /// - public string mold_id { get; set; } = string.Empty; - - } + public string mold_id { get; set; } = string.Empty; + +} } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs index 53b8ad15..2a3a79ca 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs @@ -1,77 +1,52 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具保养规则 +/// +[SugarTable("tool_mold_maintain_rule")] +public partial class ToolMoldMaintainRule : BaseEntity { - /// - ///模具保养规则 - /// - [SugarTable("tool_mold_maintain_rule")] - public partial class ToolMoldMaintainRule + public ToolMoldMaintainRule() { - public ToolMoldMaintainRule(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:保养方式 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mode {get;set;} - - /// - /// Desc:保养起止日期 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? startandend_date {get;set;} - - /// - /// Desc:保养周期 - /// Default: - /// Nullable:True - /// - public int? cycle {get;set;} - - /// - /// Desc:创建人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 保养方式 + /// + public string? mode { get; set; } + + /// + /// 保养起止日期 + /// + public string? startandend_date { get; set; } + + /// + /// 保养周期 + /// + public int? cycle { get; set; } + + /// + /// 创建人 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改人 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRuleRelation.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRuleRelation.cs index 82dce3dd..9ec5e59d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRuleRelation.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRuleRelation.cs @@ -1,35 +1,32 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具保养规则与模具关联 +/// +[SugarTable("tool_mold_maintain_rule_relation")] +public partial class ToolMoldMaintainRuleRelation : BaseEntity { - /// - ///模具保养规则与模具关联 - /// - [SugarTable("tool_mold_maintain_rule_relation")] - public partial class ToolMoldMaintainRuleRelation : BaseEntity + public ToolMoldMaintainRuleRelation() { - /// - /// Desc:保养规则id - /// Default: - /// Nullable:False - /// - public string rule_id { get; set; } = string.Empty; - - /// - /// Desc:模具id - /// Default: - /// Nullable:False - /// - public string mold_id { get; set; } = string.Empty; - /// - /// 项目组id - /// - public string item_group_id { get; set; } = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 保养规则id + /// + public string rule_id { get; set; } = string.Empty; + + /// + /// 模具id + /// + public string mold_id { get; set; } = string.Empty; + + /// + /// 项目组id + /// + public string item_group_id { get; set; } = string.Empty; + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs index e85abded..b0f50a5b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs @@ -1,199 +1,137 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具信息表 +/// +[SugarTable("tool_molds")] +public partial class ToolMolds : BaseEntity { - /// - ///模具信息表 - /// - [SugarTable("tool_molds")] - public partial class ToolMolds + public ToolMolds() { - public ToolMolds(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:模具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mold_code {get;set;} - - - /// - /// Desc:模具名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mold_name {get;set;} - - /// - /// Desc:物料Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:设备Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_id {get;set;} - - /// - /// Desc:设备代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_code {get;set;} - - /// - /// Desc:生产模数 - /// Default: - /// Nullable:True - /// - public int? production_modulus {get;set;} - - /// - /// Desc:保养模次 - /// Default: - /// Nullable:True - /// - public int? maintain_qty {get;set;} - - /// - /// Desc:磨具使用状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mold_status {get;set;} - - /// - /// Desc:日定额 - /// Default: - /// Nullable:True - /// - public decimal? daily_rate {get;set;} - - /// - /// Desc:工时定额（H/PCS） - /// Default: - /// Nullable:True - /// - public decimal? hour_norm {get;set;} - - /// - /// Desc:成长周期 - /// Default: - /// Nullable:True - /// - public int? growth_cycle {get;set;} - - /// - /// Desc:型腔数 - /// Default: - /// Nullable:True - /// - public int? cavity_qty {get;set;} - - /// - /// Desc:模具寿命 - /// Default: - /// Nullable:True - /// - public int? mold_life {get;set;} - - /// - /// Desc:模具剩余寿命 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mold_remaining_life {get;set;} - - /// - /// Desc:库房编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? warehosue_id {get;set;} - - /// - /// Desc:库位编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - - /// - /// Desc:备注 - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:模穴数 - /// Default: - /// Nullable:True - /// - public int? mold_cavity {get;set;} - - /// - /// Desc:模具型号 - /// Default: - /// Nullable:True - /// - public string? mold_type_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 模具编号 + /// + public string? mold_code { get; set; } + + /// + /// 模具名称 + /// + public string? mold_name { get; set; } + + /// + /// 物料Id + /// + public string? material_id { get; set; } + + /// + /// 设备Id + /// + public string? eqp_id { get; set; } + + /// + /// 设备代码 + /// + public string? eqp_code { get; set; } + + /// + /// 生产模数 + /// + public int? production_modulus { get; set; } + + /// + /// 保养模次 + /// + public int? maintain_qty { get; set; } + + /// + /// 磨具使用状态 + /// + public string? mold_status { get; set; } + + /// + /// 日定额 + /// + public decimal? daily_rate { get; set; } + + /// + /// 工时定额（H/PCS） + /// + public decimal? hour_norm { get; set; } + + /// + /// 成长周期 + /// + public int? growth_cycle { get; set; } + + /// + /// 型腔数 + /// + public int? cavity_qty { get; set; } + + /// + /// 模具寿命 + /// + public int? mold_life { get; set; } + + /// + /// 模具剩余寿命 + /// + public string? mold_remaining_life { get; set; } + + /// + /// 库房编号 + /// + public string? warehosue_id { get; set; } + + /// + /// 库位编号 + /// + public string? location_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 模穴数 + /// + public int? mold_cavity { get; set; } + + /// + /// 模具型号 + /// + public string? mold_type_code { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsEquipment.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsEquipment.cs index d30d800c..2e0e395c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsEquipment.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsEquipment.cs @@ -1,72 +1,47 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具设备关联表 +/// +[SugarTable("tool_molds_equipment")] +public partial class ToolMoldsEquipment : BaseEntity { - /// - ///模具设备关联表 - /// - [SugarTable("tool_molds_equipment")] - public partial class ToolMoldsEquipment + public ToolMoldsEquipment() { - public ToolMoldsEquipment(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:模具编号 - /// Default: - /// Nullable:False - /// - public string mold_id {get;set;} = string.Empty; - - /// - /// Desc:设备编号 - /// Default: - /// Nullable:False - /// - public string equipment_id {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 模具编号 + /// + public string mold_id { get; set; } = string.Empty; + + /// + /// 设备编号 + /// + public string equipment_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs index 78bdc13d..7a5b6acb 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs @@ -1,81 +1,57 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -using Tnb.Common.Contracts; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 模具物料关联表 +/// +[SugarTable("tool_molds_material")] +public partial class ToolMoldsMaterial : BaseEntity { - /// - ///模具产品关联表 - /// - [SugarTable("tool_molds_material")] - public partial class ToolMoldsMaterial:BaseEntity + public ToolMoldsMaterial() { - public ToolMoldsMaterial(){ - - - } - - - - /// - /// Desc:模具编号 - /// Default: - /// Nullable:False - /// - public string mold_id {get;set;} = string.Empty; - - /// - /// Desc:物料编号 - /// Default: - /// Nullable:False - /// - public string material_id { get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:实际使用型腔数 - /// Default: - /// Nullable:True - /// - public int? real_cavity_qty {get;set;} - - /// - /// Desc:物料同组标识 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_group { get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 模具编号 + /// + public string mold_id { get; set; } = string.Empty; + + /// + /// 物料编号 + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 实际使用型腔数 + /// + public int? real_cavity_qty { get; set; } + + /// + /// 物料同组标识 + /// + public string? material_group { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRack.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRack.cs index 53b95003..515e4d0f 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRack.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRack.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 货架 +/// +[SugarTable("tool_rack")] +public partial class ToolRack : BaseEntity { - /// - ///货架 - /// - [SugarTable("tool_rack")] - public partial class ToolRack + public ToolRack() { - public ToolRack(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:货架代码 - /// Default: - /// Nullable:False - /// - public string rack_code {get;set;} = string.Empty; - - /// - /// Desc:区域Id - /// Default: - /// Nullable:False - /// - public string region_id {get;set;} = string.Empty; - - /// - /// Desc:货架层数 - /// Default: - /// Nullable:False - /// - public int layers {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 货架代码 + /// + public string rack_code { get; set; } = string.Empty; + + /// + /// 区域Id + /// + public string region_id { get; set; } = string.Empty; + + /// + /// 货架层数 + /// + public int layers { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRegion.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRegion.cs index 7e92d064..048f5c0c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRegion.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolRegion.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 仓库区域 +/// +[SugarTable("tool_region")] +public partial class ToolRegion : BaseEntity { - /// - ///仓库区域 - /// - [SugarTable("tool_region")] - public partial class ToolRegion + public ToolRegion() { - public ToolRegion(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:仓库ID - /// Default: - /// Nullable:False - /// - public string wh_id {get;set;} = string.Empty; - - /// - /// Desc:区域代码 - /// Default: - /// Nullable:False - /// - public string region_code {get;set;} = string.Empty; - - /// - /// Desc:区域名称 - /// Default: - /// Nullable:False - /// - public string region_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 仓库ID + /// + public string wh_id { get; set; } = string.Empty; + + /// + /// 区域代码 + /// + public string region_code { get; set; } = string.Empty; + + /// + /// 区域名称 + /// + public string region_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolType.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolType.cs index 3d49dd28..fbf21451 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolType.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolType.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具类型 +/// +[SugarTable("tool_tool_type")] +public partial class ToolToolType : BaseEntity { - /// - ///工装工具类型 - /// - [SugarTable("tool_tool_type")] - public partial class ToolToolType + public ToolToolType() { - public ToolToolType(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:类型代码 - /// Default: - /// Nullable:False - /// - public string type_code {get;set;} = string.Empty; - - /// - /// Desc:类型名称 - /// Default: - /// Nullable:False - /// - public string type_name {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 类型代码 + /// + public string type_code { get; set; } = string.Empty; + + /// + /// 类型名称 + /// + public string type_name { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs index f025f57a..2d4f17a3 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_tool_type_check_period")] +public partial class ToolToolTypeCheckPeriod : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_tool_type_check_period")] - public partial class ToolToolTypeCheckPeriod + public ToolToolTypeCheckPeriod() { - public ToolToolTypeCheckPeriod(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tooltype {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tpcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string tooltype { get; set; } = string.Empty; + + /// + /// TODO + /// + public string tpcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs index d529927e..1e868f56 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// TODO +/// +[SugarTable("tool_tool_type_chek_item")] +public partial class ToolToolTypeChekItem : BaseEntity { - /// - ///TODO - /// - [SugarTable("tool_tool_type_chek_item")] - public partial class ToolToolTypeChekItem + public ToolToolTypeChekItem() { - public ToolToolTypeChekItem(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string tooltype {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string checkitemcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string checkitemname {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? resulttype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int judgetype {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limitlow {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? limithigh {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public decimal? standard {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string tooltype { get; set; } = string.Empty; + + /// + /// TODO + /// + public int seq { get; set; } + + /// + /// TODO + /// + public string checkitemcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string checkitemname { get; set; } = string.Empty; + + /// + /// TODO + /// + public string? resulttype { get; set; } + + /// + /// TODO + /// + public int judgetype { get; set; } + + /// + /// TODO + /// + public string? unit { get; set; } + + /// + /// TODO + /// + public decimal? limitlow { get; set; } + + /// + /// TODO + /// + public decimal? limithigh { get; set; } + + /// + /// TODO + /// + public decimal? standard { get; set; } + + /// + /// TODO + /// + public string? remark { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolTools.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolTools.cs index 731c9881..cb3d330c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolTools.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolTools.cs @@ -1,175 +1,122 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具 +/// +[SugarTable("tool_tools")] +public partial class ToolTools : BaseEntity { - /// - ///工装工具 - /// - [SugarTable("tool_tools")] - public partial class ToolTools + public ToolTools() { - public ToolTools(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:所属类型 - /// Default: - /// Nullable:False - /// - public string type_code {get;set;} = string.Empty; - - /// - /// Desc:工具代码 - /// Default: - /// Nullable:False - /// - public string model_code {get;set;} = string.Empty; - - /// - /// Desc:型号代码 - /// Default: - /// Nullable:False - /// - public string tool_code {get;set;} = string.Empty; - - /// - /// Desc:工具名称 - /// Default: - /// Nullable:False - /// - public string tool_name {get;set;} = string.Empty; - - /// - /// Desc:状态: 10-登记 20-在库 30-已领用 40-已安装 90-已报废 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:所在仓库Id - /// Default: - /// Nullable:True - /// - public long? ware_house_id {get;set;} - - /// - /// Desc:所在库位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_code {get;set;} - - /// - /// Desc:最大使用次数 - /// Default: - /// Nullable:True - /// - public int? maxuse_times {get;set;} - - /// - /// Desc:累计使用次数 - /// Default: - /// Nullable:True - /// - public int? used_times {get;set;} - - /// - /// Desc:周期 - /// Default: - /// Nullable:False - /// - public int cycle_times {get;set;} - - /// - /// Desc:生产厂家 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_code {get;set;} - - /// - /// Desc:联系人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? contact_name {get;set;} - - /// - /// Desc:报废原因 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? scrap_reason {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 所属类型 + /// + public string type_code { get; set; } = string.Empty; + + /// + /// 工具代码 + /// + public string model_code { get; set; } = string.Empty; + + /// + /// 型号代码 + /// + public string tool_code { get; set; } = string.Empty; + + /// + /// 工具名称 + /// + public string tool_name { get; set; } = string.Empty; + + /// + /// 状态: 10-登记 20-在库 30-已领用 40-已安装 90-已报废 + /// + public int status { get; set; } + + /// + /// 所在仓库Id + /// + public long? ware_house_id { get; set; } + + /// + /// 所在库位 + /// + public string? location_code { get; set; } + + /// + /// 最大使用次数 + /// + public int? maxuse_times { get; set; } + + /// + /// 累计使用次数 + /// + public int? used_times { get; set; } + + /// + /// 周期 + /// + public int cycle_times { get; set; } + + /// + /// 生产厂家 + /// + public string? supplier_code { get; set; } + + /// + /// 联系人 + /// + public string? contact_name { get; set; } + + /// + /// 报废原因 + /// + public string? scrap_reason { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolsLog.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolsLog.cs index 3c1cc2ba..1404ee1d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolsLog.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolsLog.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 工装工具领退废记录 +/// +[SugarTable("tool_tools_log")] +public partial class ToolToolsLog : BaseEntity { - /// - ///工装工具领退废记录 - /// - [SugarTable("tool_tools_log")] - public partial class ToolToolsLog + public ToolToolsLog() { - public ToolToolsLog(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工具代码 - /// Default: - /// Nullable:False - /// - public string tool_code {get;set;} = string.Empty; - - /// - /// Desc:"状态: 10-入库 20-领用 30-退还 40-安装 50-卸载 90-报废" - /// Default: - /// Nullable:False - /// - public int biz_type {get;set;} - - /// - /// Desc:所在仓库Id - /// Default: - /// Nullable:True - /// - public long? ware_house_id {get;set;} - - /// - /// Desc:所在库位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_code {get;set;} - - /// - /// Desc:操作人员 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? operation_name {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工具代码 + /// + public string tool_code { get; set; } = string.Empty; + + /// + /// "状态: 10-入库 20-领用 30-退还 40-安装 50-卸载 90-报废" + /// + public int biz_type { get; set; } + + /// + /// 所在仓库Id + /// + public long? ware_house_id { get; set; } + + /// + /// 所在库位 + /// + public string? location_code { get; set; } + + /// + /// 操作人员 + /// + public string? operation_name { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolWarehouse.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolWarehouse.cs index 94c0c892..16d43299 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolWarehouse.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolWarehouse.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.EquipMgr.Entities +namespace Tnb.EquipMgr.Entities; + +/// +/// 库房资料 +/// +[SugarTable("tool_warehouse")] +public partial class ToolWarehouse : BaseEntity { - /// - ///库房资料 - /// - [SugarTable("tool_warehouse")] - public partial class ToolWarehouse + public ToolWarehouse() { - public ToolWarehouse(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? orgid {get;set;} - - /// - /// Desc:库房代码 - /// Default: - /// Nullable:False - /// - public string whcode {get;set;} = string.Empty; - - /// - /// Desc:库房名称 - /// Default: - /// Nullable:False - /// - public string whname {get;set;} = string.Empty; - - /// - /// Desc:所属部门 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? departmentid {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string? orgid { get; set; } + + /// + /// 库房代码 + /// + public string whcode { get; set; } = string.Empty; + + /// + /// 库房名称 + /// + public string whname { get; set; } = string.Empty; + + /// + /// 所属部门 + /// + public string? departmentid { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs index 887c7a87..b639f300 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs @@ -1,4 +1,5 @@ using JNPF.Common.Dtos.VisualDev; +using Tnb.EquipMgr.Entities.Dto; namespace Tnb.EquipMgr.Interfaces { @@ -9,6 +10,21 @@ namespace Tnb.EquipMgr.Interfaces /// /// /// - public Task ExecuteSpotIns(string id,VisualDevModelDataUpInput input); + public Task ExecuteSpotIns(SpotInsRecordExecuteInput input); + + /// + /// 获取点巡检复核信息 + /// + /// + /// + public Task GetSpotInsRecordRepeatInfo(Dictionary dic); + + /// + /// 复核点巡检 + /// + /// + /// + public Task RepeatSpotIns(SpotInsRecordRepeatInput input); + } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs b/EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs index 9f0261fc..61f99f18 100644 --- a/EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs +++ b/EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs @@ -8,12 +8,11 @@ using JNPF.Common.Enums; using JNPF.Common.Security; using JNPF.FriendlyException; using SqlSugar; -using Tnb.Common.Contracts; using Tnb.EquipMgr.Entities.Dto; using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Utils; using Mapster; -using Tnb.Common.Extension; +using JNPF.Common.Contracts; namespace Tnb.EquipMgr { diff --git a/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs b/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs index 67d0f81c..bd1bf6b0 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs @@ -25,20 +25,24 @@ namespace Tnb.EquipMgr private readonly IUserManager _userManager; public EqpSpotInsTemService(ISqlSugarRepository repository, - IUserManager userManager, - IVisualDevService visualDevService) + IUserManager userManager) { _repository = repository; _userManager = userManager; } + /// + /// 根据模板id发布到设备 + /// + /// + [HttpPost] public async Task Publish(SpotInsTemPublishInput input) { var db = _repository.AsSugarClient(); DbResult result = await db.Ado.UseTranAsync(async () => { EqpSpotInsTemH eqpSpotInsTemH = await _repository.GetSingleAsync(x => x.id == input.id); - List eqpSpotInsTemDs = await db.Queryable().Where(x=>x.spot_ins_item_id==input.id).ToListAsync(); + List eqpSpotInsTemDs = await db.Queryable().Where(x=>x.spot_ins_tem_id==input.id).ToListAsync(); if (input.equipIds != null && input.equipIds.Length > 0) { @@ -47,7 +51,7 @@ namespace Tnb.EquipMgr foreach (var equipId in input.equipIds) { string id = SnowflakeIdHelper.NextId(); - string code = $"{DateTime.Now.ToString("yyyy-MM-dd") + equipId}"; + string code = $"{DateTime.Now.ToString("yyyyMMdd") + equipId}"; EqpSpotInsTemEquipH eqpSpotInsTemEquipH = new EqpSpotInsTemEquipH() { id = id, @@ -82,12 +86,17 @@ namespace Tnb.EquipMgr EqpSpotInsTemEquipD eqpSpotInsTemEquipD = new EqpSpotInsTemEquipD() { id = SnowflakeIdHelper.NextId(), - spot_ins_item_id = eqpSpotInsTem.id, + spot_ins_item_id = eqpSpotInsTem.spot_ins_item_id, spot_ins_tem_equip_id = id, }; insertEqpSpotInsTemEquipDs.Add(eqpSpotInsTemEquipD); } } + + EqpSpotInsTemEquipH oldSpotInsTemEquipH = await db.Queryable().Where(x => x.spot_ins_tem_id == input.id && x.equip_id == equipId).FirstAsync(); + await db.Deleteable().Where(x => x.spot_ins_tem_id == input.id && x.equip_id==equipId).ExecuteCommandAsync(); + if(oldSpotInsTemEquipH!=null) + await db.Deleteable().Where(x => x.spot_ins_tem_equip_id==oldSpotInsTemEquipH.id).ExecuteCommandAsync(); } if (insertEqpSpotInsTemEquipHs != null && insertEqpSpotInsTemEquipHs.Count > 0) diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs index 6b752382..d7fc7a2f 100644 --- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SqlSugar; using Tnb.EquipMgr.Entities; +using Tnb.EquipMgr.Entities.Dto; using Tnb.EquipMgr.Interfaces; namespace Tnb.EquipMgr @@ -39,24 +40,20 @@ namespace Tnb.EquipMgr _visualDevService = visualDevService; _runService = runService; _userManager = userManager; - OverideFuncs.UpdateAsync = ExecuteSpotIns; + // OverideFuncs.UpdateAsync = ExecuteSpotIns; } - public async Task ExecuteSpotIns(string id,[FromBody]VisualDevModelDataUpInput input) + /// + /// 执行点巡检 + /// + /// + /// + [HttpPost] + public async Task ExecuteSpotIns(SpotInsRecordExecuteInput input) { DbResult result = await _repository.AsSugarClient().Ado.UseTranAsync(async () => { - //string attachment = JsonConvert.SerializeObject(input.data["attachment"]); - // _repository.UpdateAsync(x => new EqpSpotInsRecordH() - // { - // result = (int)input.data["result"], - // attachment = attachment, - // result_remark = input.data["result_remark"].ToString(), - // }, x => x.id == input.data["id"]); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); - await _runService.Update(id,templateEntity, input); - - EqpSpotInsRecordH eqpSpotInsRecordH = _repository.GetSingle(x=>x.id==input.data["id"].ToString()); + EqpSpotInsRecordH eqpSpotInsRecordH = _repository.GetSingle(x=>x.id==input.id); string status = ""; if (eqpSpotInsRecordH.is_repeat == "1") { @@ -66,17 +63,68 @@ namespace Tnb.EquipMgr { status = SpotInsRecordExecutionStatus.COMPLETED; } - _repository.UpdateAsync(x => new EqpSpotInsRecordH() - { - status = status, - spot_record_date_time = DateTime.Now, - spot_record_user_id = _userManager.UserId - }, x => x.id == input.data["id"]); + await _repository.UpdateAsync(x => new EqpSpotInsRecordH() + { + result = input.result, + attachment = input.attachment, + result_remark = input.result_remark, + status = status, + spot_record_date_time = DateTime.Now, + spot_record_user_id = _userManager.UserId + }, x => x.id == input.id); + + foreach (var item in input.details) + { + await _repository.AsSugarClient().Updateable(). + SetColumns(x=>x.result==item["result"]) + .SetColumnsIF(item["judge_type"]=="1",x=>x.real_value==Convert.ToDouble(item["real_value"])) + .Where(x=>x.id==item["id"]) + .ExecuteCommandAsync(); + } + }); if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); return result.IsSuccess ? "执行成功" : result.ErrorMessage; } + + /// + /// 获取点巡检复核信息 + /// + /// + /// + [HttpPost] + public async Task GetSpotInsRecordRepeatInfo(Dictionary dic) + { + string id = dic["id"]; + EqpSpotInsRecordH eqpSpotInsRecordH = await _repository.GetSingleAsync(x => x.id == id); + List eqpSpotInsRecordDs = await _repository.AsSugarClient().Queryable() + .Where(x => x.spot_ins_record_id == id).ToListAsync(); + SpotInsRecordRepeatOutput output = new SpotInsRecordRepeatOutput() + { + model = eqpSpotInsRecordH, + details = eqpSpotInsRecordDs, + }; + return output; + } + + /// + /// 复核点巡检 + /// + /// + /// + [HttpPost] + public async Task RepeatSpotIns(SpotInsRecordRepeatInput input) + { + await _repository.UpdateAsync(x => new EqpSpotInsRecordH() + { + repeat_result = input.repeat_result, + repeat_remark = input.repeat_remark, + repeat_post_info_user_id = _userManager.UserId, + repeat_time = DateTime.Now, + status = SpotInsRecordExecutionStatus.COMPLETED + }, x => x.id == input.id); + } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainGroupService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainGroupService.cs index 5a94a02f..1e0826ae 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainGroupService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainGroupService.cs @@ -15,10 +15,9 @@ using JNPF.FriendlyException; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; -using Tnb.Common.Contracts; +using JNPF.Common.Contracts; using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Entities.Dto; -using Tnb.EquipMgr.Entities.Entity; using Tnb.EquipMgr.Interfaces; namespace Tnb.EquipMgr diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/Molds.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/Molds.cs deleted file mode 100644 index dfd49b6c..00000000 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/Molds.cs +++ /dev/null @@ -1,186 +0,0 @@ -using System; -using System.Linq; -using System.Text; -using SqlSugar; - -namespace Tnb.ProductionMgr.Entities -{ - /// - ///模具信息表 - /// - [SugarTable("tool_molds")] - public partial class Molds - { - public Molds() - { - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey = true)] - public string id { get; set; } - - /// - /// Desc:生产模数 - /// Default: - /// Nullable:True - /// - public int? production_modulus { get; set; } - - /// - /// Desc:保养模次 - /// Default: - /// Nullable:True - /// - public int? maintain_qty { get; set; } - - /// - /// Desc:日定额 - /// Default: - /// Nullable:True - /// - public decimal? daily_rate { get; set; } - - /// - /// Desc:工时定额（H/PCS） - /// Default: - /// Nullable:True - /// - public decimal? hour_norm { get; set; } - - /// - /// Desc:成长周期 - /// Default: - /// Nullable:True - /// - public int? growth_cycle { get; set; } - - /// - /// Desc:型腔数 - /// Default: - /// Nullable:True - /// - public int cavity_qty { get; set; } - - /// - /// Desc:模具寿命 - /// Default: - /// Nullable:True - /// - public int? mold_life { get; set; } - - /// - /// Desc:备注 - /// Default: - /// Nullable:True - /// - public string remark { get; set; } - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time { get; set; } - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time { get; set; } - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string extras { get; set; } - - /// - /// Desc:模具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string mold_code { get; set; } - - /// - /// Desc:模具名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string mold_name { get; set; } - - /// - /// Desc:产品Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string material_id { get; set; } - - /// - /// Desc:设备Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string eqp_id { get; set; } - - /// - /// Desc:设备代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string eqp_code { get; set; } - - /// - /// Desc:磨具使用状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string mold_status { get; set; } - - /// - /// Desc:模具剩余寿命 - /// Default:NULL::character varying - /// Nullable:True - /// - public string mold_remaining_life { get; set; } - - /// - /// Desc:库房编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string warehosue_id { get; set; } - - /// - /// Desc:库位编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string location_id { get; set; } - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string create_id { get; set; } - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string modify_id { get; set; } - /// - /// 模具型号 - /// - public string mold_type_code { get; set; } - - } -} diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/MoldsEntity.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/MoldsEntity.cs index 853d16b5..beec7c50 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/MoldsEntity.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/MoldsEntity.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using SqlSugar; -using Tnb.Common.Contracts; +using JNPF.Common.Contracts; namespace Tnb.ProductionMgr.Entities { diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonInfo.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonInfo.cs index 85ae6b78..c0d6478c 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonInfo.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonInfo.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 包装箱号信息 +/// +[SugarTable("prd_carton_info")] +public partial class PrdCartonInfo : BaseEntity { - /// - ///包装箱号信息 - /// - [SugarTable("prd_carton_info")] - public partial class PrdCartonInfo + public PrdCartonInfo() { - public PrdCartonInfo(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:箱号 - /// Default: - /// Nullable:False - /// - public string carton_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:箱子容量 - /// Default: - /// Nullable:False - /// - public decimal capacity {get;set;} - - /// - /// Desc:已放入数量 - /// Default: - /// Nullable:False - /// - public decimal collected_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 箱号 + /// + public string carton_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string? mo_code { get; set; } + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 箱子容量 + /// + public decimal capacity { get; set; } + + /// + /// 已放入数量 + /// + public decimal collected_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcard.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcard.cs index fe70a895..6e0f326c 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcard.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcard.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 包装箱号和产品序列号的关系 +/// +[SugarTable("prd_carton_rcard")] +public partial class PrdCartonRcard : BaseEntity { - /// - ///包装箱号和产品序列号的关系 - /// - [SugarTable("prd_carton_rcard")] - public partial class PrdCartonRcard + public PrdCartonRcard() { - public PrdCartonRcard(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:箱号 - /// Default: - /// Nullable:False - /// - public string carton_no {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号数量 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 箱号 + /// + public string carton_no { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号数量 + /// + public decimal relation_qty { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcardLog.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcardLog.cs index 3f6dc984..a59ac98f 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcardLog.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdCartonRcardLog.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 包装箱号和产品序列号的关系日志 +/// +[SugarTable("prd_carton_rcard_log")] +public partial class PrdCartonRcardLog : BaseEntity { - /// - ///包装箱号和产品序列号的关系日志 - /// - [SugarTable("prd_carton_rcard_log")] - public partial class PrdCartonRcardLog + public PrdCartonRcardLog() { - public PrdCartonRcardLog(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:箱号 - /// Default: - /// Nullable:False - /// - public string carton_no {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号数量 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:包装用户名称 - /// Default: - /// Nullable:False - /// - public string pack_user_name {get;set;} = string.Empty; - - /// - /// Desc:包装时间 - /// Default: - /// Nullable:False - /// - public DateTime pack_time {get;set;} - - /// - /// Desc:拆解用户名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remove_user_name {get;set;} - - /// - /// Desc:拆解时间 - /// Default: - /// Nullable:True - /// - public DateTime? remove_time {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 箱号 + /// + public string carton_no { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号数量 + /// + public decimal relation_qty { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 包装用户名称 + /// + public string pack_user_name { get; set; } = string.Empty; + + /// + /// 包装时间 + /// + public DateTime pack_time { get; set; } = DateTime.Now; + + /// + /// 拆解用户名称 + /// + public string? remove_user_name { get; set; } + + /// + /// 拆解时间 + /// + public DateTime? remove_time { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatch.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatch.cs index 477a1fbb..f4c054e9 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatch.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatch.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工序派工单 +/// +[SugarTable("prd_dispatch")] +public partial class PrdDispatch : BaseEntity { - /// - ///工序派工单 - /// - [SugarTable("prd_dispatch")] - public partial class PrdDispatch + public PrdDispatch() { - public PrdDispatch(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:派工单代码 - /// Default: - /// Nullable:False - /// - public string dispatch_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:计划派工数 - /// Default: - /// Nullable:False - /// - public decimal plan_qty {get;set;} - - /// - /// Desc:工作中心代码 - /// Default: - /// Nullable:False - /// - public string work_center_code {get;set;} = string.Empty; - - /// - /// Desc:派工单状态:10 未派工 20 已派工 30 工位派工 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:派工单状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? dispatch_status {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 派工单代码 + /// + public string dispatch_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 计划派工数 + /// + public decimal plan_qty { get; set; } + + /// + /// 工作中心代码 + /// + public string work_center_code { get; set; } = string.Empty; + + /// + /// 派工单状态:10 未派工 20 已派工 30 工位派工 + /// + public string status { get; set; } = string.Empty; + + /// + /// 派工单状态 + /// + public string? dispatch_status { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatchStation.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatchStation.cs index 53147ef6..f83b0850 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatchStation.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdDispatchStation.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工位派工单 +/// +[SugarTable("prd_dispatch_station")] +public partial class PrdDispatchStation : BaseEntity { - /// - ///工位派工单 - /// - [SugarTable("prd_dispatch_station")] - public partial class PrdDispatchStation + public PrdDispatchStation() { - public PrdDispatchStation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:派工单代码 - /// Default: - /// Nullable:False - /// - public string dispatch_code {get;set;} = string.Empty; - - /// - /// Desc:派工单序号(1开始,最大+1,不强制连续) - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:计划派工数 - /// Default: - /// Nullable:False - /// - public decimal plan_qty {get;set;} - - /// - /// Desc:工作中心代码 - /// Default: - /// Nullable:False - /// - public string work_center_code {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:派工单状态:10 未派工 20 已派工 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? dispatch_status {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 派工单代码 + /// + public string dispatch_code { get; set; } = string.Empty; + + /// + /// 派工单序号(1开始,最大+1,不强制连续) + /// + public int seq { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 计划派工数 + /// + public decimal plan_qty { get; set; } + + /// + /// 工作中心代码 + /// + public string work_center_code { get; set; } = string.Empty; + + /// + /// 状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 派工单状态:10 未派工 20 已派工 + /// + public string? dispatch_status { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdEqpdown.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdEqpdown.cs index 48c09c51..745affcf 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdEqpdown.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdEqpdown.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 设备停机记录 +/// +[SugarTable("prd_eqpdown")] +public partial class PrdEqpdown : BaseEntity { - /// - ///设备停机记录 - /// - [SugarTable("prd_eqpdown")] - public partial class PrdEqpdown + public PrdEqpdown() { - public PrdEqpdown(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:生产场地 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? work_shop {get;set;} - - /// - /// Desc:设备Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_id {get;set;} - - /// - /// Desc:设备名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_name {get;set;} - - /// - /// Desc:停机类别 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? down_type {get;set;} - - /// - /// Desc:停机原因 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? down_cause {get;set;} - - /// - /// Desc:开始操作人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? start_name {get;set;} - - /// - /// Desc:开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? start_time {get;set;} - - /// - /// Desc:开始备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? start_remark {get;set;} - - /// - /// Desc:结束操作人 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? end_name {get;set;} - - /// - /// Desc:结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:结束备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? end_remark {get;set;} - - /// - /// Desc:补录时间 - /// Default: - /// Nullable:True - /// - public DateTime? sup_recard_time {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 生产场地 + /// + public string? work_shop { get; set; } + + /// + /// 设备Id + /// + public string? eqp_id { get; set; } + + /// + /// 设备名称 + /// + public string? eqp_name { get; set; } + + /// + /// 停机类别 + /// + public string? down_type { get; set; } + + /// + /// 停机原因 + /// + public string? down_cause { get; set; } + + /// + /// 开始操作人 + /// + public string? start_name { get; set; } + + /// + /// 开始时间 + /// + public DateTime? start_time { get; set; } + + /// + /// 开始备注 + /// + public string? start_remark { get; set; } + + /// + /// 结束操作人 + /// + public string? end_name { get; set; } + + /// + /// 结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 结束备注 + /// + public string? end_remark { get; set; } + + /// + /// 补录时间 + /// + public DateTime? sup_recard_time { get; set; } + + /// + /// 时间戳 + /// + public DateTime? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedback.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedback.cs index 59c0d630..786649a4 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedback.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedback.cs @@ -1,175 +1,122 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批次工序报工信息表 +/// +[SugarTable("prd_lot_feedback")] +public partial class PrdLotFeedback : BaseEntity { - /// - ///批次工序报工信息表 - /// - [SugarTable("prd_lot_feedback")] - public partial class PrdLotFeedback + public PrdLotFeedback() { - public PrdLotFeedback(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:批次号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:项目代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:合格数量 - /// Default: - /// Nullable:True - /// - public decimal? qualifity_qty {get;set;} - - /// - /// Desc:不合格数量 - /// Default: - /// Nullable:True - /// - public decimal? un_qualifity_qty {get;set;} - - /// - /// Desc:废弃料数量 - /// Default: - /// Nullable:True - /// - public decimal? scrap_qty {get;set;} - - /// - /// Desc:人时报工(分钟） - /// Default: - /// Nullable:True - /// - public decimal? man_time {get;set;} - - /// - /// Desc:机时报工(分钟) - /// Default: - /// Nullable:True - /// - public decimal? machine_time {get;set;} - - /// - /// Desc:人员表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? staffs {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 批次号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 项目代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 合格数量 + /// + public decimal? qualifity_qty { get; set; } + + /// + /// 不合格数量 + /// + public decimal? un_qualifity_qty { get; set; } + + /// + /// 废弃料数量 + /// + public decimal? scrap_qty { get; set; } + + /// + /// 人时报工(分钟） + /// + public decimal? man_time { get; set; } + + /// + /// 机时报工(分钟) + /// + public decimal? machine_time { get; set; } + + /// + /// 人员表 + /// + public string? staffs { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedbackRecord.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedbackRecord.cs index afd959ac..8723ebf5 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedbackRecord.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotFeedbackRecord.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批次报工记录表 +/// +[SugarTable("prd_lot_feedback_record")] +public partial class PrdLotFeedbackRecord : BaseEntity { - /// - ///批次报工记录表 - /// - [SugarTable("prd_lot_feedback_record")] - public partial class PrdLotFeedbackRecord + public PrdLotFeedbackRecord() { - public PrdLotFeedbackRecord(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:序列号 - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:批次号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:项目代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:合格数量 - /// Default: - /// Nullable:True - /// - public decimal? qualifity_qty {get;set;} - - /// - /// Desc:不合格数量 - /// Default: - /// Nullable:True - /// - public decimal? un_qualifity_qty {get;set;} - - /// - /// Desc:废弃料 - /// Default: - /// Nullable:True - /// - public decimal? scrap_qty {get;set;} - - /// - /// Desc:人时报工(分钟) - /// Default: - /// Nullable:True - /// - public decimal? man_time {get;set;} - - /// - /// Desc:机时报工(分钟) - /// Default: - /// Nullable:True - /// - public decimal? machine_time {get;set;} - - /// - /// Desc:报工人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? feedback_user_id {get;set;} - - /// - /// Desc:报工人员名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? feedback_user_name {get;set;} - - /// - /// Desc:报工时间 - /// Default: - /// Nullable:True - /// - public DateTime? feedback_time {get;set;} - - /// - /// Desc:员工表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? staffs {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 序列号 + /// + public int seq { get; set; } + + /// + /// 批次号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string? mo_code { get; set; } + + /// + /// 项目代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 合格数量 + /// + public decimal? qualifity_qty { get; set; } + + /// + /// 不合格数量 + /// + public decimal? un_qualifity_qty { get; set; } + + /// + /// 废弃料 + /// + public decimal? scrap_qty { get; set; } + + /// + /// 人时报工(分钟) + /// + public decimal? man_time { get; set; } + + /// + /// 机时报工(分钟) + /// + public decimal? machine_time { get; set; } + + /// + /// 报工人员ID + /// + public string? feedback_user_id { get; set; } + + /// + /// 报工人员名称 + /// + public string? feedback_user_name { get; set; } + + /// + /// 报工时间 + /// + public DateTime? feedback_time { get; set; } + + /// + /// 员工表 + /// + public string? staffs { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotOperation.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotOperation.cs index 3bc59224..db89eb89 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotOperation.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotOperation.cs @@ -1,175 +1,122 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批次操作记录信息 +/// +[SugarTable("prd_lot_operation")] +public partial class PrdLotOperation : BaseEntity { - /// - ///批次操作记录信息 - /// - [SugarTable("prd_lot_operation")] - public partial class PrdLotOperation + public PrdLotOperation() { - public PrdLotOperation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:批次号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:开始时间 - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:操作间隔时间(分钟数) - /// Default: - /// Nullable:True - /// - public DateTime? work_duration {get;set;} - - /// - /// Desc:操作类型： START-开工 STOP-停工 RESUME-复工 FEEDBACK-报工 COMPLETE-完工 - /// Default: - /// Nullable:False - /// - public string operation_type {get;set;} = string.Empty; - - /// - /// Desc:作业状态： NEW-未开工 WORK-作业中 STOP-停工 COMPLETE-完工 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:开工进站数量 - /// Default: - /// Nullable:True - /// - public decimal? input_qty {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 批次号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 开始时间 + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// 结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 操作间隔时间(分钟数) + /// + public DateTime? work_duration { get; set; } + + /// + /// 操作类型： START-开工 STOP-停工 RESUME-复工 FEEDBACK-报工 COMPLETE-完工 + /// + public string operation_type { get; set; } = string.Empty; + + /// + /// 作业状态： NEW-未开工 WORK-作业中 STOP-停工 COMPLETE-完工 + /// + public string status { get; set; } = string.Empty; + + /// + /// 开工进站数量 + /// + public decimal? input_qty { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRcard.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRcard.cs index a157c55d..d407c33d 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRcard.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRcard.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批次产品序列号 +/// +[SugarTable("prd_lot_rcard")] +public partial class PrdLotRcard : BaseEntity { - /// - ///批次产品序列号 - /// - [SugarTable("prd_lot_rcard")] - public partial class PrdLotRcard + public PrdLotRcard() { - public PrdLotRcard(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:批次号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 批次号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepair.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepair.cs index 3187f3f1..e1448d70 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepair.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepair.cs @@ -1,280 +1,197 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批次维修主资料 +/// +[SugarTable("prd_lot_repair")] +public partial class PrdLotRepair : BaseEntity { - /// - ///批次维修主资料 - /// - [SugarTable("prd_lot_repair")] - public partial class PrdLotRepair + public PrdLotRepair() { - public PrdLotRepair(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:批次号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:送修工艺路线代码 - /// Default: - /// Nullable:False - /// - public string from_route_code {get;set;} = string.Empty; - - /// - /// Desc:送修工艺路线版本 - /// Default: - /// Nullable:False - /// - public string from_route_version {get;set;} = string.Empty; - - /// - /// Desc:送修工序代码 - /// Default: - /// Nullable:False - /// - public string from_process_code {get;set;} = string.Empty; - - /// - /// Desc:送修工段代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? from_segment_code {get;set;} - - /// - /// Desc:送修产线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? from_production_line_code {get;set;} - - /// - /// Desc:送修工位代码 - /// Default: - /// Nullable:False - /// - public string from_station_code {get;set;} = string.Empty; - - /// - /// Desc:送修年份 - /// Default: - /// Nullable:False - /// - public int from_year {get;set;} - - /// - /// Desc:送修月份 - /// Default: - /// Nullable:False - /// - public int from_month {get;set;} - - /// - /// Desc:送修周别 - /// Default: - /// Nullable:False - /// - public int from_week {get;set;} - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shift_type_code {get;set;} = string.Empty; - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:True - /// - public string? tp_code {get;set;} - - /// - /// Desc:工厂日 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:送修人名称 - /// Default: - /// Nullable:False - /// - public string from_user_name {get;set;} = string.Empty; - - /// - /// Desc:送修备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? from_memo {get;set;} - - /// - /// Desc:送修时间 - /// Default: - /// Nullable:False - /// - public DateTime from_time {get;set;} - - /// - /// Desc:维修来源类型 - /// Default: - /// Nullable:False - /// - public string from_input_type {get;set;} = string.Empty; - - /// - /// Desc:维修状态 New, (产线发现不良) Repair, (维修中) Complete, (维修完成) - /// Default: - /// Nullable:False - /// - public string repair_status {get;set;} = string.Empty; - - /// - /// Desc:维修完成人ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repaired_user_id {get;set;} - - /// - /// Desc:维修完成人员姓名 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reparied_user_name {get;set;} - - /// - /// Desc:维修完成时间 - /// Default: - /// Nullable:True - /// - public DateTime? repaired_time {get;set;} - - /// - /// Desc: 维修完成工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reparied_station_code {get;set;} - - /// - /// Desc:维系完成回流批次号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repaired_reflow_lot_no {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:处理状态： UNHANDLE-待处理 HANDLE-已处理 - /// Default: - /// Nullable:False - /// - public string handle_type {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 批次号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 送修工艺路线代码 + /// + public string from_route_code { get; set; } = string.Empty; + + /// + /// 送修工艺路线版本 + /// + public string from_route_version { get; set; } = string.Empty; + + /// + /// 送修工序代码 + /// + public string from_process_code { get; set; } = string.Empty; + + /// + /// 送修工段代码 + /// + public string? from_segment_code { get; set; } + + /// + /// 送修产线代码 + /// + public string? from_production_line_code { get; set; } + + /// + /// 送修工位代码 + /// + public string from_station_code { get; set; } = string.Empty; + + /// + /// 送修年份 + /// + public int from_year { get; set; } + + /// + /// 送修月份 + /// + public int from_month { get; set; } + + /// + /// 送修周别 + /// + public int from_week { get; set; } + + /// + /// 班制代码 + /// + public string shift_type_code { get; set; } = string.Empty; + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 时段代码 + /// + public string? tp_code { get; set; } + + /// + /// 工厂日 + /// + public int shift_day { get; set; } + + /// + /// 送修人名称 + /// + public string from_user_name { get; set; } = string.Empty; + + /// + /// 送修备注 + /// + public string? from_memo { get; set; } + + /// + /// 送修时间 + /// + public DateTime from_time { get; set; } = DateTime.Now; + + /// + /// 维修来源类型 + /// + public string from_input_type { get; set; } = string.Empty; + + /// + /// 维修状态 New, (产线发现不良) Repair, (维修中) Complete, (维修完成) + /// + public string repair_status { get; set; } = string.Empty; + + /// + /// 维修完成人ID + /// + public string? repaired_user_id { get; set; } + + /// + /// 维修完成人员姓名 + /// + public string? reparied_user_name { get; set; } + + /// + /// 维修完成时间 + /// + public DateTime? repaired_time { get; set; } + + /// + /// 维修完成工序代码 + /// + public string? reparied_station_code { get; set; } + + /// + /// 维系完成回流批次号 + /// + public string? repaired_reflow_lot_no { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 处理状态： UNHANDLE-待处理 HANDLE-已处理 + /// + public string handle_type { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepairErrorcode.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepairErrorcode.cs index 12db155d..325fad00 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepairErrorcode.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotRepairErrorcode.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修不良代码 +/// +[SugarTable("prd_lot_repair_errorcode")] +public partial class PrdLotRepairErrorcode : BaseEntity { - /// - ///维修不良代码 - /// - [SugarTable("prd_lot_repair_errorcode")] - public partial class PrdLotRepairErrorcode + public PrdLotRepairErrorcode() { - public PrdLotRepairErrorcode(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:GUID - /// Default: - /// Nullable:False - /// - public string repair_id {get;set;} = string.Empty; - - /// - /// Desc:不良代码组 - /// Default: - /// Nullable:False - /// - public string error_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良代码 - /// Default: - /// Nullable:False - /// - public string error_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号/批次号/派工单号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:待处理不良数量 - /// Default: - /// Nullable:True - /// - public decimal? wait_qty {get;set;} - - /// - /// Desc:处理后合格数量 - /// Default: - /// Nullable:True - /// - public decimal? qualifity_qty {get;set;} - - /// - /// Desc:处理后不合格数量 - /// Default: - /// Nullable:True - /// - public decimal? unqualifity_qty {get;set;} - - /// - /// Desc:处理后报废数量 - /// Default: - /// Nullable:True - /// - public decimal? scrap_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:处理状态： UNHANDLE-待处理 HANDLE-已处理 - /// Default: - /// Nullable:False - /// - public string handle_type {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// GUID + /// + public string repair_id { get; set; } = string.Empty; + + /// + /// 不良代码组 + /// + public string error_group_code { get; set; } = string.Empty; + + /// + /// 不良代码 + /// + public string error_code { get; set; } = string.Empty; + + /// + /// 产品序列号/批次号/派工单号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 待处理不良数量 + /// + public decimal? wait_qty { get; set; } + + /// + /// 处理后合格数量 + /// + public decimal? qualifity_qty { get; set; } + + /// + /// 处理后不合格数量 + /// + public decimal? unqualifity_qty { get; set; } + + /// + /// 处理后报废数量 + /// + public decimal? scrap_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 处理状态： UNHANDLE-待处理 HANDLE-已处理 + /// + public string handle_type { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotSimulation.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotSimulation.cs index 3685682e..04564e7c 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotSimulation.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotSimulation.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批次在制品信息 +/// +[SugarTable("prd_lot_simulation")] +public partial class PrdLotSimulation : BaseEntity { - /// - ///批次在制品信息 - /// - [SugarTable("prd_lot_simulation")] - public partial class PrdLotSimulation + public PrdLotSimulation() { - public PrdLotSimulation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:批次号/派工单代码 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:开工时间 - /// Default: - /// Nullable:False - /// - public DateTime start_time {get;set;} - - /// - /// Desc:完工时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:作业总人时(分钟数) - /// Default: - /// Nullable:True - /// - public decimal? man_time {get;set;} - - /// - /// Desc:作业总机时(分钟数） - /// Default: - /// Nullable:True - /// - public decimal? machine_time {get;set;} - - /// - /// Desc:作业状态： NEW-未开工 WORK-作业中 STOP-停工 COMPLETE-完工 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:进站数量 - /// Default: - /// Nullable:True - /// - public decimal? input_qty {get;set;} - - /// - /// Desc:合格数量 - /// Default: - /// Nullable:True - /// - public decimal? qualifity_qty {get;set;} - - /// - /// Desc:不合格数量 - /// Default: - /// Nullable:True - /// - public decimal? un_qualifity_qty {get;set;} - - /// - /// Desc:报废数量 - /// Default: - /// Nullable:True - /// - public decimal? scrap_qty {get;set;} - - /// - /// Desc:员工表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? staffs {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 批次号/派工单代码 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 开工时间 + /// + public DateTime start_time { get; set; } = DateTime.Now; + + /// + /// 完工时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 作业总人时(分钟数) + /// + public decimal? man_time { get; set; } + + /// + /// 作业总机时(分钟数） + /// + public decimal? machine_time { get; set; } + + /// + /// 作业状态： NEW-未开工 WORK-作业中 STOP-停工 COMPLETE-完工 + /// + public string status { get; set; } = string.Empty; + + /// + /// 进站数量 + /// + public decimal? input_qty { get; set; } + + /// + /// 合格数量 + /// + public decimal? qualifity_qty { get; set; } + + /// + /// 不合格数量 + /// + public decimal? un_qualifity_qty { get; set; } + + /// + /// 报废数量 + /// + public decimal? scrap_qty { get; set; } + + /// + /// 员工表 + /// + public string? staffs { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotStationmerge.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotStationmerge.cs index bcd710b6..7533c87c 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotStationmerge.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdLotStationmerge.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// prd_lot_stationmerge +/// +[SugarTable("prd_lot_stationmerge")] +public partial class PrdLotStationmerge : BaseEntity { - /// - ///prd_lot_stationmerge - /// - [SugarTable("prd_lot_stationmerge")] - public partial class PrdLotStationmerge + public PrdLotStationmerge() { - public PrdLotStationmerge(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:批次号 - /// Default: - /// Nullable:False - /// - public string lot_no {get;set;} = string.Empty; - - /// - /// Desc:转换序列号 - /// Default: - /// Nullable:False - /// - public string merge_lot_no {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:生产数量 - /// Default: - /// Nullable:False - /// - public decimal input_qty {get;set;} - - /// - /// Desc:合格数量 - /// Default: - /// Nullable:True - /// - public decimal? qualifity_qty {get;set;} - - /// - /// Desc:不合格数量 - /// Default: - /// Nullable:True - /// - public decimal? un_qualifity_qty {get;set;} - - /// - /// Desc:报废数量 - /// Default: - /// Nullable:True - /// - public decimal? scrap_qty {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 批次号 + /// + public string lot_no { get; set; } = string.Empty; + + /// + /// 转换序列号 + /// + public string merge_lot_no { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 生产数量 + /// + public decimal input_qty { get; set; } + + /// + /// 合格数量 + /// + public decimal? qualifity_qty { get; set; } + + /// + /// 不合格数量 + /// + public decimal? un_qualifity_qty { get; set; } + + /// + /// 报废数量 + /// + public decimal? scrap_qty { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs index 26fd6543..82a83bbb 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs @@ -1,315 +1,222 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// MES生产工单 +/// +[SugarTable("prd_mo")] +public partial class PrdMo : BaseEntity { - /// - ///MES生产工单 - /// - [SugarTable("prd_mo")] - public partial class PrdMo + public PrdMo() { - public PrdMo(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:物料编号 - /// Default: - /// Nullable:True - /// - public string? material_code {get;set;} - - /// - /// Desc:工单类型：1-正常工单、2-返工工单、3-试制工单 - /// Default: - /// Nullable:True - /// - public string? mo_type {get;set;} - - /// - /// Desc:生产状态 Initial: 初始, Confirm:确认 Release: 下发, Open: 生产中, Close: 关单, Pending: 暂停 - /// Default: - /// Nullable:True - /// - public string? mo_status {get;set;} - - /// - /// Desc:计划生产数量 - /// Default: - /// Nullable:True - /// - public int? plan_qty {get;set;} - - /// - /// Desc:已投入数量 - /// Default: - /// Nullable:True - /// - public int? input_qty {get;set;} - - /// - /// Desc:已完工数量 - /// Default: - /// Nullable:True - /// - public int? complete_qty {get;set;} - - /// - /// Desc:报废数量 - /// Default: - /// Nullable:True - /// - public int? scrap_qty {get;set;} - - /// - /// Desc:计划开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_start_date {get;set;} - - /// - /// Desc:计划结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_end_date {get;set;} - - /// - /// Desc:实际开工日期 - /// Default: - /// Nullable:True - /// - public DateTime? act_start_date {get;set;} - - /// - /// Desc:实际完工日期 - /// Default: - /// Nullable:True - /// - public DateTime? act_end_date {get;set;} - - /// - /// Desc:生产部门ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? dept_id {get;set;} - - /// - /// Desc:客户代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? customer_code {get;set;} - - /// - /// Desc:订单号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? order_no {get;set;} - - /// - /// Desc:订单行号 - /// Default: - /// Nullable:True - /// - public int? order_seq {get;set;} - - /// - /// Desc:BOM版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? bom_version {get;set;} - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:True - /// - public int? relation_ratio {get;set;} - - /// - /// Desc:下发人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_down_user_id {get;set;} - - /// - /// Desc:下发人员名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_down_user_name {get;set;} - - /// - /// Desc:下发日期 - /// Default: - /// Nullable:True - /// - public DateTime? mo_down_date {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:工作中心代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? work_center_code {get;set;} - - /// - /// Desc:主工单代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? parent_mo_code {get;set;} - - /// - /// Desc:排程开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? seduling_start_date {get;set;} - - /// - /// Desc:排程结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? seduling_end_date {get;set;} - - /// - /// Desc:是否生派工单 - /// Default: - /// Nullable:True - /// - public int? is_create_dispatch {get;set;} - - /// - /// Desc:子工单序号(1开始,最大+1,不强制连续) - /// Default: - /// Nullable:True - /// - public int? seq {get;set;} - - /// - /// Desc:数据来源 10-计划,20-插入,30-导入 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? data_sources {get;set;} - - /// - /// Desc:产线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? production_linecode {get;set;} - - /// - /// Desc:是否合并 - /// Default: - /// Nullable:True - /// - public int? is_merge {get;set;} - - /// - /// Desc:组合工单 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? combine_mo_code {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:物料ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:已排产数量 - /// Default: - /// Nullable:True - /// - public int? scheduled_qty {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 物料编号 + /// + public string? material_code { get; set; } + + /// + /// 工单类型：1-正常工单、2-返工工单、3-试制工单 + /// + public string? mo_type { get; set; } + + /// + /// 生产状态 Initial: 初始, Confirm:确认 Release: 下发, Open: 生产中, Close: 关单, Pending: 暂停 + /// + public string? mo_status { get; set; } + + /// + /// 计划生产数量 + /// + public int? plan_qty { get; set; } + + /// + /// 已投入数量 + /// + public int? input_qty { get; set; } + + /// + /// 已完工数量 + /// + public int? complete_qty { get; set; } + + /// + /// 报废数量 + /// + public int? scrap_qty { get; set; } + + /// + /// 计划开始时间 + /// + public DateTime? plan_start_date { get; set; } + + /// + /// 计划结束时间 + /// + public DateTime? plan_end_date { get; set; } + + /// + /// 实际开工日期 + /// + public DateTime? act_start_date { get; set; } + + /// + /// 实际完工日期 + /// + public DateTime? act_end_date { get; set; } + + /// + /// 生产部门ID + /// + public string? dept_id { get; set; } + + /// + /// 客户代码 + /// + public string? customer_code { get; set; } + + /// + /// 订单号 + /// + public string? order_no { get; set; } + + /// + /// 订单行号 + /// + public int? order_seq { get; set; } + + /// + /// BOM版本 + /// + public string? bom_version { get; set; } + + /// + /// 关联比例 + /// + public decimal? relation_ratio { get; set; } + + /// + /// 下发人员ID + /// + public string? mo_down_user_id { get; set; } + + /// + /// 下发人员名称 + /// + public string? mo_down_user_name { get; set; } + + /// + /// 下发日期 + /// + public DateTime? mo_down_date { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 工作中心代码 + /// + public string? work_center_code { get; set; } + + /// + /// 主工单代码 + /// + public string? parent_mo_code { get; set; } + + /// + /// 排程开始时间 + /// + public DateTime? seduling_start_date { get; set; } + + /// + /// 排程结束时间 + /// + public DateTime? seduling_end_date { get; set; } + + /// + /// 是否生派工单 + /// + public int? is_create_dispatch { get; set; } + + /// + /// 子工单序号(1开始,最大+1,不强制连续) + /// + public int? seq { get; set; } + + /// + /// 数据来源 10-计划,20-插入,30-导入 + /// + public string? data_sources { get; set; } + + /// + /// 产线代码 + /// + public string? production_linecode { get; set; } + + /// + /// 是否合并 + /// + public int? is_merge { get; set; } + + /// + /// 组合工单 + /// + public string? combine_mo_code { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 物料ID + /// + public string? material_id { get; set; } + + /// + /// 已排产数量 + /// + public int? scheduled_qty { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoBom.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoBom.cs index 29a5a6dd..898cceaf 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoBom.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoBom.cs @@ -1,231 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工单BOM资料 +/// +[SugarTable("prd_mo_bom")] +public partial class PrdMoBom : BaseEntity { - /// - ///工单BOM资料 - /// - [SugarTable("prd_mo_bom")] - public partial class PrdMoBom + public PrdMoBom() { - public PrdMoBom(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单明细ID - /// Default: - /// Nullable:False - /// - public string mo_detail_id {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:工单行号 - /// Default: - /// Nullable:False - /// - public int mo_line {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:物品附属信息 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_attribute {get;set;} - - /// - /// Desc:单位 - /// Default: - /// Nullable:False - /// - public string unit {get;set;} = string.Empty; - - /// - /// Desc:(1入库倒冲/2工序倒冲/3领料/4.虚拟件) - /// Default: - /// Nullable:False - /// - public int wip_type {get;set;} - - /// - /// Desc:prdorgid - /// Default:NULL::character varying - /// Nullable:True - /// - public string? prd_org_id {get;set;} - - /// - /// Desc:计划发料数量 - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:已领数量 - /// Default: - /// Nullable:True - /// - public decimal? pick_qty {get;set;} - - /// - /// Desc:已调拨数量 - /// Default: - /// Nullable:True - /// - public decimal? trans_qty {get;set;} - - /// - /// Desc:已扫描领用数量 - /// Default: - /// Nullable:True - /// - public decimal? scan_pick_qty {get;set;} - - /// - /// Desc:已扫描调拨数量 - /// Default: - /// Nullable:True - /// - public decimal? scan_trans_qty {get;set;} - - /// - /// Desc:feedqty - /// Default: - /// Nullable:True - /// - public decimal? feed_qty {get;set;} - - /// - /// Desc:unitqty - /// Default: - /// Nullable:True - /// - public decimal? unit_qty {get;set;} - - /// - /// Desc:损耗率 - /// Default: - /// Nullable:True - /// - public decimal? compscap_qty {get;set;} - - /// - /// Desc:是否计算 - /// Default: - /// Nullable:True - /// - public int? is_comsume {get;set;} - - /// - /// Desc:仓库ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? wh_id {get;set;} - - /// - /// Desc:仓库代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? wh_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单明细ID + /// + public string mo_detail_id { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 工单行号 + /// + public int mo_line { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 物品附属信息 + /// + public string? material_attribute { get; set; } + + /// + /// 单位 + /// + public string unit { get; set; } = string.Empty; + + /// + /// (1入库倒冲/2工序倒冲/3领料/4.虚拟件) + /// + public int wip_type { get; set; } + + /// + /// prdorgid + /// + public string? prd_org_id { get; set; } + + /// + /// 计划发料数量 + /// + public decimal qty { get; set; } + + /// + /// 已领数量 + /// + public decimal? pick_qty { get; set; } + + /// + /// 已调拨数量 + /// + public decimal? trans_qty { get; set; } + + /// + /// 已扫描领用数量 + /// + public decimal? scan_pick_qty { get; set; } + + /// + /// 已扫描调拨数量 + /// + public decimal? scan_trans_qty { get; set; } + + /// + /// feedqty + /// + public decimal? feed_qty { get; set; } + + /// + /// unitqty + /// + public decimal? unit_qty { get; set; } + + /// + /// 损耗率 + /// + public decimal? compscap_qty { get; set; } + + /// + /// 是否计算 + /// + public int? is_comsume { get; set; } + + /// + /// 仓库ID + /// + public string? wh_id { get; set; } + + /// + /// 仓库代码 + /// + public string? wh_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoLine.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoLine.cs index 2f56df99..6c2b6c8a 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoLine.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoLine.cs @@ -1,70 +1,47 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工单与产线关联关系 +/// +[SugarTable("prd_mo_line")] +public partial class PrdMoLine : BaseEntity { - /// - ///工单与产线关联关系 - /// - [SugarTable("prd_mo_line")] - public partial class PrdMoLine + public PrdMoLine() { - public PrdMoLine(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:工单Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_id {get;set;} - - /// - /// Desc:产线Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? line_id {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 工单Id + /// + public string? mo_id { get; set; } + + /// + /// 产线Id + /// + public string? line_id { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcard.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcard.cs index 1fea635e..3b52a173 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcard.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcard.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工单与产品序列号的关联关系 +/// +[SugarTable("prd_mo_rcard")] +public partial class PrdMoRcard : BaseEntity { - /// - ///工单与产品序列号的关联关系 - /// - [SugarTable("prd_mo_rcard")] - public partial class PrdMoRcard + public PrdMoRcard() { - public PrdMoRcard(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单ID - /// Default: - /// Nullable:False - /// - public string mo_id {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:打印次数 - /// Default: - /// Nullable:True - /// - public int? print_times {get;set;} - - /// - /// Desc:最后一次打印人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? last_print_user_id {get;set;} - - /// - /// Desc:最后一次打印人员姓名 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? last_print_user_name {get;set;} - - /// - /// Desc:最后一次打印时间 - /// Default: - /// Nullable:True - /// - public DateTime? last_print_time {get;set;} - - /// - /// Desc:条码状态： AVAILABLE-可用 SCRAP-报废 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单ID + /// + public string mo_id { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 关联比例 + /// + public decimal relation_qty { get; set; } + + /// + /// 打印次数 + /// + public int? print_times { get; set; } + + /// + /// 最后一次打印人员ID + /// + public string? last_print_user_id { get; set; } + + /// + /// 最后一次打印人员姓名 + /// + public string? last_print_user_name { get; set; } + + /// + /// 最后一次打印时间 + /// + public DateTime? last_print_time { get; set; } + + /// + /// 条码状态： AVAILABLE-可用 SCRAP-报废 + /// + public string status { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcardHistory.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcardHistory.cs index c4f7af28..30d35e10 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcardHistory.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRcardHistory.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工单产品序列号操作记录表 +/// +[SugarTable("prd_mo_rcard_history")] +public partial class PrdMoRcardHistory : BaseEntity { - /// - ///工单产品序列号操作记录表 - /// - [SugarTable("prd_mo_rcard_history")] - public partial class PrdMoRcardHistory + public PrdMoRcardHistory() { - public PrdMoRcardHistory(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单ID - /// Default: - /// Nullable:False - /// - public string mo_id {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:条码操作： REPRINT-补印 SCRAP-报废 - /// Default: - /// Nullable:False - /// - public string operation {get;set;} = string.Empty; - - /// - /// Desc:操作申请人ID - /// Default: - /// Nullable:False - /// - public string apply_user_id {get;set;} = string.Empty; - - /// - /// Desc:操作申请人名称 - /// Default: - /// Nullable:False - /// - public string apply_user_name {get;set;} = string.Empty; - - /// - /// Desc:操作申请原因 - /// Default: - /// Nullable:False - /// - public string apply_reason {get;set;} = string.Empty; - - /// - /// Desc:操作申请日期 - /// Default: - /// Nullable:False - /// - public DateTime apply_date {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单ID + /// + public string mo_id { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 条码操作： REPRINT-补印 SCRAP-报废 + /// + public string operation { get; set; } = string.Empty; + + /// + /// 操作申请人ID + /// + public string apply_user_id { get; set; } = string.Empty; + + /// + /// 操作申请人名称 + /// + public string apply_user_name { get; set; } = string.Empty; + + /// + /// 操作申请原因 + /// + public string apply_reason { get; set; } = string.Empty; + + /// + /// 操作申请日期 + /// + public DateTime apply_date { get; set; } = DateTime.Now; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRoute.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRoute.cs index cfcedd0f..08d9dceb 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRoute.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoRoute.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 工单与工艺路线的关系 +/// +[SugarTable("prd_mo_route")] +public partial class PrdMoRoute : BaseEntity { - /// - ///工单与工艺路线的关系 - /// - [SugarTable("prd_mo_route")] - public partial class PrdMoRoute + public PrdMoRoute() { - public PrdMoRoute(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? route_version {get;set;} - - /// - /// Desc:工序BOM版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? process_bom_version {get;set;} - - /// - /// Desc:是否是主途程（当前工艺路线） - /// Default: - /// Nullable:False - /// - public int is_main_route {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string? route_version { get; set; } + + /// + /// 工序BOM版本 + /// + public string? process_bom_version { get; set; } + + /// + /// 是否是主途程（当前工艺路线） + /// + public int is_main_route { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs index bccd0a6f..e53d8c16 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs @@ -1,247 +1,172 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 生产任务信息 +/// +[SugarTable("prd_mo_task")] +public partial class PrdMoTask : BaseEntity { - /// - ///生产任务信息 - /// - [SugarTable("prd_mo_task")] - public partial class PrdMoTask + public PrdMoTask() { - public PrdMoTask() - { - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey = true)] - public string id { get; set; } = SnowflakeIdHelper.NextId(); - - /// - /// Desc:生产任务编号 - /// Default: - /// Nullable:True - /// - public string? mo_task_code { get; set; } - - /// - /// Desc:工单Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_id { get; set; } - - /// - /// Desc:物料Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id { get; set; } - - /// - /// Desc:模具Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mold_id { get; set; } - - /// - /// Desc:设备Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_id { get; set; } - - /// - /// Desc:产线id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? workline_id { get; set; } - - /// - /// Desc:工位id - /// Default: - /// Nullable:True - /// - public string? workstation_id { get; set; } - - /// - /// Desc:工艺路线id - /// Default: - /// Nullable:True - /// - public string? workroute_id { get; set; } - - /// - /// Desc:生产bom id - /// Default: - /// Nullable:True - /// - public string? bom_id { get; set; } - - /// - /// Desc:任务单状态 - /// Default: - /// Nullable:True - /// - public string? mo_task_status { get; set; } - - /// - /// Desc:计划数量 - /// Default: - /// Nullable:True - /// - public int? plan_qty { get; set; } - - /// - /// Desc:已投入数量 - /// Default: - /// Nullable:True - /// - public int? input_qty { get; set; } - - /// - /// Desc:已完工数量 - /// Default: - /// Nullable:True - /// - public int? complete_qty { get; set; } - - /// - /// Desc:报废数量 - /// Default: - /// Nullable:True - /// - public int? scrap_qty { get; set; } - - /// - /// Desc:已排产数量 - /// Default: - /// Nullable:True - /// - public int? scheduled_qty { get; set; } - - /// - /// Desc:排产类型:1、注塑、挤出2、组装、包装 - /// Default: - /// Nullable:True - /// - public int? schedule_type { get; set; } - - /// - /// Desc:计划开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_start_date { get; set; } - - /// - /// Desc:计划结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_end_date { get; set; } - - /// - /// Desc:实际开工日期 - /// Default: - /// Nullable:True - /// - public DateTime? act_start_date { get; set; } - - /// - /// Desc:实际完工日期 - /// Default: - /// Nullable:True - /// - public DateTime? act_end_date { get; set; } - - /// - /// Desc:创建人 - /// Default: - /// Nullable:True - /// - public string? create_id { get; set; } - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time { get; set; } - - /// - /// Desc:修改人 - /// Default: - /// Nullable:True - /// - public string? modify_id { get; set; } - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time { get; set; } - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras { get; set; } - - /// - /// Desc:生产顺序 - /// Default: - /// Nullable:True - /// - public int? prd_order { get; set; } - - /// - /// Desc:预计开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? estimated_start_date { get; set; } - - /// - /// Desc:预计结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? estimated_end_date { get; set; } - - /// - /// Desc:同组标识 - /// Default: - /// Nullable:True - /// - public int? group_flag { get; set; } - - /// - /// Desc:父任务Id - /// Default: - /// Nullable:True - /// - public string? parent_id { get; set; } - - /// - /// Desc:工序任务量 - /// Default: - /// Nullable:True - /// - public int? process_task_qty { get; set; } - - + id = SnowflakeIdHelper.NextId(); } + /// + /// 生产任务编号 + /// + public string? mo_task_code { get; set; } + + /// + /// 工单Id + /// + public string? mo_id { get; set; } + + /// + /// 物料Id + /// + public string? material_id { get; set; } + + /// + /// 模具Id + /// + public string? mold_id { get; set; } + + /// + /// 设备Id + /// + public string? eqp_id { get; set; } + + /// + /// 产线id + /// + public string? workline_id { get; set; } + + /// + /// 工位id + /// + public string? workstation_id { get; set; } + + /// + /// 工艺路线id + /// + public string? workroute_id { get; set; } + + /// + /// 生产bom id + /// + public string? bom_id { get; set; } + + /// + /// 任务单状态 + /// + public string? mo_task_status { get; set; } + + /// + /// 计划数量 + /// + public int? plan_qty { get; set; } + + /// + /// 已投入数量 + /// + public int? input_qty { get; set; } + + /// + /// 已完工数量 + /// + public int? complete_qty { get; set; } + + /// + /// 报废数量 + /// + public int? scrap_qty { get; set; } + + /// + /// 已排产数量 + /// + public int? scheduled_qty { get; set; } + + /// + /// 排产类型:1、注塑、挤出2、组装、包装 + /// + public int? schedule_type { get; set; } + + /// + /// 计划开始时间 + /// + public DateTime? plan_start_date { get; set; } + + /// + /// 计划结束时间 + /// + public DateTime? plan_end_date { get; set; } + + /// + /// 实际开工日期 + /// + public DateTime? act_start_date { get; set; } + + /// + /// 实际完工日期 + /// + public DateTime? act_end_date { get; set; } + + /// + /// 创建人 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改人 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 生产顺序 + /// + public int? prd_order { get; set; } + + /// + /// 预计开始时间 + /// + public DateTime? estimated_start_date { get; set; } + + /// + /// 预计结束时间 + /// + public DateTime? estimated_end_date { get; set; } + + /// + /// 同组标识 + /// + public int? group_flag { get; set; } + + /// + /// 父任务Id + /// + public string? parent_id { get; set; } + + /// + /// 工序任务量 + /// + public int? process_task_qty { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefect.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefect.cs index f733f2f4..a298e511 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefect.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefect.cs @@ -1,77 +1,52 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// TODO +/// +[SugarTable("prd_mo_task_defect")] +public partial class PrdMoTaskDefect : BaseEntity { - /// - ///TODO - /// - [SugarTable("prd_mo_task_defect")] - public partial class PrdMoTaskDefect + public PrdMoTaskDefect() { - public PrdMoTaskDefect(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:任务单id - /// Default: - /// Nullable:True - /// - public string? mo_task_id {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:次品分类id - /// Default: - /// Nullable:True - /// - public string? defective_cagetory_id {get;set;} - - /// - /// Desc:次品项 - /// Default: - /// Nullable:True - /// - public string? defective_item {get;set;} - - /// - /// Desc:次品项数量 - /// Default: - /// Nullable:True - /// - public int? defective_item_qty {get;set;} - - /// - /// Desc:批次 - /// Default: - /// Nullable:True - /// - public string? batch {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 任务单id + /// + public string? mo_task_id { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 次品分类id + /// + public string? defective_cagetory_id { get; set; } + + /// + /// 次品项 + /// + public string? defective_item { get; set; } + + /// + /// 次品项数量 + /// + public int? defective_item_qty { get; set; } + + /// + /// 批次 + /// + public string? batch { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefectRecord.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefectRecord.cs index 01f872bc..254eea97 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefectRecord.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefectRecord.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// +/// +[SugarTable("prd_mo_task_defect_record")] +public partial class PrdMoTaskDefectRecord : BaseEntity { - /// - /// - /// - [SugarTable("prd_mo_task_defect_record")] - public partial class PrdMoTaskDefectRecord + public PrdMoTaskDefectRecord() { - public PrdMoTaskDefectRecord(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:物料编码 - /// Default: - /// Nullable:True - /// - public string? material_code {get;set;} - - /// - /// Desc:物料名称 - /// Default: - /// Nullable:True - /// - public string? material_name {get;set;} - - /// - /// Desc:设备编码 - /// Default: - /// Nullable:True - /// - public string? eqp_code {get;set;} - - /// - /// Desc:模具名称 - /// Default: - /// Nullable:True - /// - public string? mold_name {get;set;} - - /// - /// Desc:预计开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? estimated_start_date {get;set;} - - /// - /// Desc:预计结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? estimated_end_date {get;set;} - - /// - /// Desc:计划生产数量 - /// Default: - /// Nullable:True - /// - public int? plan_qty {get;set;} - - /// - /// Desc:报废数量 - /// Default: - /// Nullable:True - /// - public int? scrap_qty {get;set;} - - /// - /// Desc:生产任务单状态 - /// Default: - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:创建人Id - /// Default: - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:任务单Id - /// Default: - /// Nullable:True - /// - public string? mo_task_id {get;set;} - - /// - /// Desc:任务单编号 - /// Default: - /// Nullable:True - /// - public string? mo_task_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 物料编码 + /// + public string? material_code { get; set; } + + /// + /// 物料名称 + /// + public string? material_name { get; set; } + + /// + /// 设备编码 + /// + public string? eqp_code { get; set; } + + /// + /// 模具名称 + /// + public string? mold_name { get; set; } + + /// + /// 预计开始时间 + /// + public DateTime? estimated_start_date { get; set; } + + /// + /// 预计结束时间 + /// + public DateTime? estimated_end_date { get; set; } + + /// + /// 计划生产数量 + /// + public int? plan_qty { get; set; } + + /// + /// 报废数量 + /// + public int? scrap_qty { get; set; } + + /// + /// 生产任务单状态 + /// + public string? status { get; set; } + + /// + /// 创建人Id + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 任务单Id + /// + public string? mo_task_id { get; set; } + + /// + /// 任务单编号 + /// + public string? mo_task_code { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskLog.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskLog.cs index 40953705..602beb67 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskLog.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskLog.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 生产任务操作记录 +/// +[SugarTable("prd_mo_task_log")] +public partial class PrdMoTaskLog : BaseEntity { - /// - ///生产任务操作记录 - /// - [SugarTable("prd_mo_task_log")] - public partial class PrdMoTaskLog + public PrdMoTaskLog() { - public PrdMoTaskLog(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:工单号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:设备编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_code {get;set;} - - /// - /// Desc:模具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mold_code {get;set;} - - /// - /// Desc:产品编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_code {get;set;} - - /// - /// Desc:产品规格型号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_standard {get;set;} - - /// - /// Desc:任务单状态 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? status {get;set;} - - /// - /// Desc:操作人姓名 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? operator_name {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:生产任务ID - /// Default: - /// Nullable:True - /// - public string? mo_task_id {get;set;} - - /// - /// Desc:任务单编号 - /// Default: - /// Nullable:True - /// - public string? mo_task_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 工单号 + /// + public string? mo_code { get; set; } + + /// + /// 设备编号 + /// + public string? eqp_code { get; set; } + + /// + /// 模具编号 + /// + public string? mold_code { get; set; } + + /// + /// 产品编号 + /// + public string? item_code { get; set; } + + /// + /// 产品规格型号 + /// + public string? item_standard { get; set; } + + /// + /// 任务单状态 + /// + public string? status { get; set; } + + /// + /// 操作人姓名 + /// + public string? operator_name { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 生产任务ID + /// + public string? mo_task_id { get; set; } + + /// + /// 任务单编号 + /// + public string? mo_task_code { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwip.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwip.cs index 1ca40392..db0df225 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwip.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwip.cs @@ -1,273 +1,192 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 过站事件历史记录 +/// +[SugarTable("prd_onwip")] +public partial class PrdOnwip : BaseEntity { - /// - ///过站事件历史记录 - /// - [SugarTable("prd_onwip")] - public partial class PrdOnwip + public PrdOnwip() { - public PrdOnwip(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号过站次序 - /// Default: - /// Nullable:False - /// - public int r_card_seq {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号 - /// Default: - /// Nullable:False - /// - public string source_card {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号流水号 - /// Default: - /// Nullable:False - /// - public int source_card_seq {get;set;} - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shift_type_code {get;set;} = string.Empty; - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:产线代码 - /// Default: - /// Nullable:False - /// - public string production_line_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:过站事件代码 - /// Default: - /// Nullable:False - /// - public string action {get;set;} = string.Empty; - - /// - /// Desc:过帐事件结果 - /// Default: - /// Nullable:False - /// - public string action_result {get;set;} = string.Empty; - - /// - /// Desc:NG总次数 - /// Default: - /// Nullable:False - /// - public int ng_times {get;set;} - - /// - /// Desc:自增长Serial(Oracle脚本创建) - /// Default: - /// Nullable:False - /// - public string serial {get;set;} = string.Empty; - - /// - /// Desc:过站开始时间 - /// Default: - /// Nullable:False - /// - public DateTime begin_time {get;set;} - - /// - /// Desc:过站结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:是否做过产量计算 - /// Default: - /// Nullable:False - /// - public int processed {get;set;} - - /// - /// Desc:人员表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? staffs {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号过站次序 + /// + public int r_card_seq { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号 + /// + public string source_card { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号流水号 + /// + public int source_card_seq { get; set; } + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 关联比例 + /// + public decimal relation_qty { get; set; } + + /// + /// 班制代码 + /// + public string shift_type_code { get; set; } = string.Empty; + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 产线代码 + /// + public string production_line_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 过站事件代码 + /// + public string action { get; set; } = string.Empty; + + /// + /// 过帐事件结果 + /// + public string action_result { get; set; } = string.Empty; + + /// + /// NG总次数 + /// + public int ng_times { get; set; } + + /// + /// 自增长Serial(Oracle脚本创建) + /// + public string serial { get; set; } = string.Empty; + + /// + /// 过站开始时间 + /// + public DateTime begin_time { get; set; } = DateTime.Now; + + /// + /// 过站结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 是否做过产量计算 + /// + public int processed { get; set; } + + /// + /// 人员表 + /// + public string? staffs { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipInfo.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipInfo.cs index 81343eb6..a3461b5e 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipInfo.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipInfo.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 在制品统计信息 +/// +[SugarTable("prd_onwip_info")] +public partial class PrdOnwipInfo : BaseEntity { - /// - ///在制品统计信息 - /// - [SugarTable("prd_onwip_info")] - public partial class PrdOnwipInfo + public PrdOnwipInfo() { - public PrdOnwipInfo(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string op_code {get;set;} = string.Empty; - - /// - /// Desc:待作业数 - /// Default: - /// Nullable:False - /// - public decimal wait_qty {get;set;} - - /// - /// Desc:作业中数 - /// Default: - /// Nullable:False - /// - public decimal process_qty {get;set;} - - /// - /// Desc:作业完成数 - /// Default: - /// Nullable:False - /// - public decimal complete_qty {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string op_code { get; set; } = string.Empty; + + /// + /// 待作业数 + /// + public decimal wait_qty { get; set; } + + /// + /// 作业中数 + /// + public decimal process_qty { get; set; } + + /// + /// 作业完成数 + /// + public decimal complete_qty { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcard.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcard.cs index 8c634643..8dab9dfa 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcard.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcard.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 在制品工序作业中产品序列号 +/// +[SugarTable("prd_onwip_rcard")] +public partial class PrdOnwipRcard : BaseEntity { - /// - ///在制品工序作业中产品序列号 - /// - [SugarTable("prd_onwip_rcard")] - public partial class PrdOnwipRcard + public PrdOnwipRcard() { - public PrdOnwipRcard(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string op_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:开始作业时间 - /// Default: - /// Nullable:False - /// - public DateTime begin_time {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string op_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 开始作业时间 + /// + public DateTime begin_time { get; set; } = DateTime.Now; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcardtrans.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcardtrans.cs index e9a5bfd6..27eb81f1 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcardtrans.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipRcardtrans.cs @@ -1,238 +1,167 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 序列号转换历史记录 +/// +[SugarTable("prd_onwip_rcardtrans")] +public partial class PrdOnwipRcardtrans : BaseEntity { - /// - ///序列号转换历史记录 - /// - [SugarTable("prd_onwip_rcardtrans")] - public partial class PrdOnwipRcardtrans + public PrdOnwipRcardtrans() { - public PrdOnwipRcardtrans(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号过站次序 - /// Default: - /// Nullable:False - /// - public int r_card_seq {get;set;} - - /// - /// Desc:转换前的产品序列号 - /// Default: - /// Nullable:False - /// - public string t_card {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号流水号 - /// Default: - /// Nullable:False - /// - public int t_card_seq {get;set;} - - /// - /// Desc:最初的产品序列号 - /// Default: - /// Nullable:False - /// - public string source_card {get;set;} = string.Empty; - - /// - /// Desc:最初的产品序列号流水号 - /// Default: - /// Nullable:False - /// - public int source_card_seq {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:产品分类代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:途程代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:途程版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:产线代码 - /// Default: - /// Nullable:False - /// - public string production_line_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shift_type_code {get;set;} = string.Empty; - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:序列号转换类型 IdMerge: 序列号转换, Router: 分板， Replace:序列号替换 - /// Default: - /// Nullable:False - /// - public int id_merge_type {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号过站次序 + /// + public int r_card_seq { get; set; } + + /// + /// 转换前的产品序列号 + /// + public string t_card { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号流水号 + /// + public int t_card_seq { get; set; } + + /// + /// 最初的产品序列号 + /// + public string source_card { get; set; } = string.Empty; + + /// + /// 最初的产品序列号流水号 + /// + public int source_card_seq { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 产品分类代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 关联比例 + /// + public decimal relation_qty { get; set; } + + /// + /// 途程代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 途程版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 产线代码 + /// + public string production_line_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 班制代码 + /// + public string shift_type_code { get; set; } = string.Empty; + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 序列号转换类型 IdMerge: 序列号转换, Router: 分板， Replace:序列号替换 + /// + public int id_merge_type { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs index cba25ca5..bd3d4f33 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// TODO +/// +[SugarTable("prd_onwip_tool")] +public partial class PrdOnwipTool : BaseEntity { - /// - ///TODO - /// - [SugarTable("prd_onwip_tool")] - public partial class PrdOnwipTool + public PrdOnwipTool() { - public PrdOnwipTool(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public int? tenantid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? orgid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string rcard {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string toolcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string routecode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string routeversion {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public string processcode {get;set;} = string.Empty; - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public int usetimes {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute1 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute2 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? attribute3 {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? timestamp {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public DateTime? lastmodificationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? lastmodifieruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? lastmodifierfullname {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:False - /// - public DateTime creationtime {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public long? creatoruserid {get;set;} - - /// - /// Desc:TODO - /// Default: - /// Nullable:True - /// - public string? creatorfullname {get;set;} - + } + /// + /// TODO + /// + public int? tenantid { get; set; } + + /// + /// TODO + /// + public long? orgid { get; set; } + + /// + /// TODO + /// + public string rcard { get; set; } = string.Empty; + + /// + /// TODO + /// + public string toolcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string routecode { get; set; } = string.Empty; + + /// + /// TODO + /// + public string routeversion { get; set; } = string.Empty; + + /// + /// TODO + /// + public string processcode { get; set; } = string.Empty; + + /// + /// TODO + /// + public int usetimes { get; set; } + + /// + /// TODO + /// + public string? attribute1 { get; set; } + + /// + /// TODO + /// + public string? attribute2 { get; set; } + + /// + /// TODO + /// + public string? attribute3 { get; set; } + + /// + /// TODO + /// + public string? timestamp { get; set; } + + /// + /// TODO + /// + public DateTime? lastmodificationtime { get; set; } + + /// + /// TODO + /// + public long? lastmodifieruserid { get; set; } + + /// + /// TODO + /// + public string? lastmodifierfullname { get; set; } + + /// + /// TODO + /// + public DateTime creationtime { get; set; } = DateTime.Now; + + /// + /// TODO + /// + public long? creatoruserid { get; set; } + + /// + /// TODO + /// + public string? creatorfullname { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipmaterial.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipmaterial.cs index e2c1f60d..41c624be 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipmaterial.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipmaterial.cs @@ -1,294 +1,207 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 上料历史记录 +/// +[SugarTable("prd_onwipmaterial")] +public partial class PrdOnwipmaterial : BaseEntity { - /// - ///上料历史记录 - /// - [SugarTable("prd_onwipmaterial")] - public partial class PrdOnwipmaterial + public PrdOnwipmaterial() { - public PrdOnwipmaterial(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号过站次序 - /// Default: - /// Nullable:False - /// - public int r_card_seq {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:物料上料次序 - /// Default: - /// Nullable:False - /// - public int material_seq {get;set;} - - /// - /// Desc:最小包装号或半成品的产品序列号 - /// Default: - /// Nullable:False - /// - public string material_card {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:物料类型 - /// Default: - /// Nullable:False - /// - public int material_type {get;set;} - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:供应商代码 - /// Default: - /// Nullable:False - /// - public string vendor_code {get;set;} = string.Empty; - - /// - /// Desc:供应商LOT号 - /// Default: - /// Nullable:False - /// - public string vendor_lot {get;set;} = string.Empty; - - /// - /// Desc:生产日期（入库日期） - /// Default: - /// Nullable:False - /// - public int date_code {get;set;} - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shift_type_code {get;set;} = string.Empty; - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:产线代码 - /// Default: - /// Nullable:False - /// - public string production_line_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:事件类型：1:上料, 2:拆解 - /// Default: - /// Nullable:False - /// - public string action_type {get;set;} = string.Empty; - - /// - /// Desc:拆解人姓名 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? drop_user_name {get;set;} - - /// - /// Desc:拆解人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? drop_user_id {get;set;} - - /// - /// Desc:拆解时间 - /// Default: - /// Nullable:True - /// - public DateTime? drop_time {get;set;} - - /// - /// Desc:拆解岗位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? drop_station {get;set;} - - /// - /// Desc:拆解工序 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? drop_process_code {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号过站次序 + /// + public int r_card_seq { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 物料上料次序 + /// + public int material_seq { get; set; } + + /// + /// 最小包装号或半成品的产品序列号 + /// + public string material_card { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 物料代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 物料类型 + /// + public int material_type { get; set; } + + /// + /// 数量 + /// + public decimal qty { get; set; } + + /// + /// 供应商代码 + /// + public string vendor_code { get; set; } = string.Empty; + + /// + /// 供应商LOT号 + /// + public string vendor_lot { get; set; } = string.Empty; + + /// + /// 生产日期（入库日期） + /// + public int date_code { get; set; } + + /// + /// 班制代码 + /// + public string shift_type_code { get; set; } = string.Empty; + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 产线代码 + /// + public string production_line_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 事件类型：1:上料, 2:拆解 + /// + public string action_type { get; set; } = string.Empty; + + /// + /// 拆解人姓名 + /// + public string? drop_user_name { get; set; } + + /// + /// 拆解人员ID + /// + public string? drop_user_id { get; set; } + + /// + /// 拆解时间 + /// + public DateTime? drop_time { get; set; } + + /// + /// 拆解岗位 + /// + public string? drop_station { get; set; } + + /// + /// 拆解工序 + /// + public string? drop_process_code { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdProcessParameterdata.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdProcessParameterdata.cs index bfe90888..b97a6daa 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdProcessParameterdata.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdProcessParameterdata.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// prd_process_parameterdata +/// +[SugarTable("prd_process_parameterdata")] +public partial class PrdProcessParameterdata : BaseEntity { - /// - ///prd_process_parameterdata - /// - [SugarTable("prd_process_parameterdata")] - public partial class PrdProcessParameterdata + public PrdProcessParameterdata() { - public PrdProcessParameterdata(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工艺参数代码 - /// Default: - /// Nullable:False - /// - public string parameter_code {get;set;} = string.Empty; - - /// - /// Desc:工艺参数名称 - /// Default: - /// Nullable:False - /// - public string parameter_name {get;set;} = string.Empty; - - /// - /// Desc:工艺参数类型 - /// Default: - /// Nullable:False - /// - public string parameter_type {get;set;} = string.Empty; - - /// - /// Desc:单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:下限值 - /// Default: - /// Nullable:True - /// - public decimal? limit_low {get;set;} - - /// - /// Desc:上限值 - /// Default: - /// Nullable:True - /// - public decimal? limit_high {get;set;} - - /// - /// Desc:标准值 - /// Default: - /// Nullable:True - /// - public decimal? standard {get;set;} - - /// - /// Desc:实际值 - /// Default: - /// Nullable:True - /// - public decimal? actual {get;set;} - - /// - /// Desc:结果 - /// Default: - /// Nullable:True - /// - public int? result {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工艺参数代码 + /// + public string parameter_code { get; set; } = string.Empty; + + /// + /// 工艺参数名称 + /// + public string parameter_name { get; set; } = string.Empty; + + /// + /// 工艺参数类型 + /// + public string parameter_type { get; set; } = string.Empty; + + /// + /// 单位 + /// + public string? unit { get; set; } + + /// + /// 下限值 + /// + public decimal? limit_low { get; set; } + + /// + /// 上限值 + /// + public decimal? limit_high { get; set; } + + /// + /// 标准值 + /// + public decimal? standard { get; set; } + + /// + /// 实际值 + /// + public decimal? actual { get; set; } + + /// + /// 结果 + /// + public int? result { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepair.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepair.cs index 236aa2be..e3359227 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepair.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepair.cs @@ -1,413 +1,292 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修主资料 +/// +[SugarTable("prd_repair")] +public partial class PrdRepair : BaseEntity { - /// - ///维修主资料 - /// - [SugarTable("prd_repair")] - public partial class PrdRepair + public PrdRepair() { - public PrdRepair(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号过站次序 - /// Default: - /// Nullable:False - /// - public int r_card_seq {get;set;} - - /// - /// Desc:转换前的产品序列号 - /// Default: - /// Nullable:False - /// - public string source_card {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号流水号 - /// Default: - /// Nullable:False - /// - public int source_card_seq {get;set;} - - /// - /// Desc:Card类型： cardtype_product: 成品, cardtype_part: 物料 - /// Default: - /// Nullable:False - /// - public string card_type {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:送修途程代码 - /// Default: - /// Nullable:False - /// - public string from_route_code {get;set;} = string.Empty; - - /// - /// Desc:送修途程版本 - /// Default: - /// Nullable:False - /// - public string from_route_version {get;set;} = string.Empty; - - /// - /// Desc:送修工序代码 - /// Default: - /// Nullable:False - /// - public string from_process_code {get;set;} = string.Empty; - - /// - /// Desc:送修工段代码 - /// Default: - /// Nullable:False - /// - public string from_segment_code {get;set;} = string.Empty; - - /// - /// Desc:送修产线代码 - /// Default: - /// Nullable:False - /// - public string from_product_linecode {get;set;} = string.Empty; - - /// - /// Desc:送修工位代码 - /// Default: - /// Nullable:False - /// - public string from_station_code {get;set;} = string.Empty; - - /// - /// Desc:送修年份 - /// Default: - /// Nullable:False - /// - public int from_year {get;set;} - - /// - /// Desc:送修月份 - /// Default: - /// Nullable:False - /// - public int from_month {get;set;} - - /// - /// Desc:送修周别 - /// Default: - /// Nullable:False - /// - public int from_week {get;set;} - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shift_type_code {get;set;} = string.Empty; - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:送修人名称 - /// Default: - /// Nullable:False - /// - public string from_user_name {get;set;} = string.Empty; - - /// - /// Desc:送修备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? from_memo {get;set;} - - /// - /// Desc:送修时间 - /// Default: - /// Nullable:False - /// - public DateTime from_time {get;set;} - - /// - /// Desc:维修来源类型 Onwip, Repair, RMA - /// Default: - /// Nullable:False - /// - public string from_input_type {get;set;} = string.Empty; - - /// - /// Desc:NG次数 - /// Default: - /// Nullable:False - /// - public int ng_times {get;set;} - - /// - /// Desc:维修状态 New, (产线发现不良) Confirm, (送修完) Repair, (维修中) Complete, (维修完成) Reflow, (维修回流) Scrap, (报废) Repeatng, OffMO, (脱离工单) Split(拆解) - /// Default: - /// Nullable:False - /// - public string repair_status {get;set;} = string.Empty; - - /// - /// Desc:维修完成人名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repaired_user_name {get;set;} - - /// - /// Desc:维修完成时间 - /// Default: - /// Nullable:True - /// - public DateTime? repaired_time {get;set;} - - /// - /// Desc:维修完成备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repaired_demo {get;set;} - - /// - /// Desc:确认工位代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? confirm_station_code {get;set;} - - /// - /// Desc:确认产线代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? confirm_process_code {get;set;} - - /// - /// Desc:确认人员名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? confirm_user_name {get;set;} - - /// - /// Desc:确认时间 - /// Default: - /// Nullable:True - /// - public DateTime? confirm_time {get;set;} - - /// - /// Desc:回流工单代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reflow_mo_code {get;set;} - - /// - /// Desc:回流途程代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reflow_route_code {get;set;} - - /// - /// Desc:回流涂程版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reflow_route_version {get;set;} - - /// - /// Desc:回流工序代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reflow_process_code {get;set;} - - /// - /// Desc:回流岗位代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reflow_station_code {get;set;} - - /// - /// Desc:维修岗位代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repair_station_code {get;set;} - - /// - /// Desc:报废原因 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? scrap_cause {get;set;} - - /// - /// Desc:送修线外工序 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? from_out_route_code {get;set;} - - /// - /// Desc:维修类型 Normal: 普通, Misjudge: 误判 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repair_type {get;set;} - - /// - /// Desc:RMA单号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? rma_bill_code {get;set;} - - /// - /// Desc:维修人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repair_user_id {get;set;} - - /// - /// Desc:维修人员姓名 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? repair_user_name {get;set;} - - /// - /// Desc:维修时间 - /// Default: - /// Nullable:True - /// - public DateTime? repair_time {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号过站次序 + /// + public int r_card_seq { get; set; } + + /// + /// 转换前的产品序列号 + /// + public string source_card { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号流水号 + /// + public int source_card_seq { get; set; } + + /// + /// Card类型： cardtype_product: 成品, cardtype_part: 物料 + /// + public string card_type { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 送修途程代码 + /// + public string from_route_code { get; set; } = string.Empty; + + /// + /// 送修途程版本 + /// + public string from_route_version { get; set; } = string.Empty; + + /// + /// 送修工序代码 + /// + public string from_process_code { get; set; } = string.Empty; + + /// + /// 送修工段代码 + /// + public string from_segment_code { get; set; } = string.Empty; + + /// + /// 送修产线代码 + /// + public string from_product_linecode { get; set; } = string.Empty; + + /// + /// 送修工位代码 + /// + public string from_station_code { get; set; } = string.Empty; + + /// + /// 送修年份 + /// + public int from_year { get; set; } + + /// + /// 送修月份 + /// + public int from_month { get; set; } + + /// + /// 送修周别 + /// + public int from_week { get; set; } + + /// + /// 班制代码 + /// + public string shift_type_code { get; set; } = string.Empty; + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 送修人名称 + /// + public string from_user_name { get; set; } = string.Empty; + + /// + /// 送修备注 + /// + public string? from_memo { get; set; } + + /// + /// 送修时间 + /// + public DateTime from_time { get; set; } = DateTime.Now; + + /// + /// 维修来源类型 Onwip, Repair, RMA + /// + public string from_input_type { get; set; } = string.Empty; + + /// + /// NG次数 + /// + public int ng_times { get; set; } + + /// + /// 维修状态 New, (产线发现不良) Confirm, (送修完) Repair, (维修中) Complete, (维修完成) Reflow, (维修回流) Scrap, (报废) Repeatng, OffMO, (脱离工单) Split(拆解) + /// + public string repair_status { get; set; } = string.Empty; + + /// + /// 维修完成人名称 + /// + public string? repaired_user_name { get; set; } + + /// + /// 维修完成时间 + /// + public DateTime? repaired_time { get; set; } + + /// + /// 维修完成备注 + /// + public string? repaired_demo { get; set; } + + /// + /// 确认工位代码 + /// + public string? confirm_station_code { get; set; } + + /// + /// 确认产线代码 + /// + public string? confirm_process_code { get; set; } + + /// + /// 确认人员名称 + /// + public string? confirm_user_name { get; set; } + + /// + /// 确认时间 + /// + public DateTime? confirm_time { get; set; } + + /// + /// 回流工单代码 + /// + public string? reflow_mo_code { get; set; } + + /// + /// 回流途程代码 + /// + public string? reflow_route_code { get; set; } + + /// + /// 回流涂程版本 + /// + public string? reflow_route_version { get; set; } + + /// + /// 回流工序代码 + /// + public string? reflow_process_code { get; set; } + + /// + /// 回流岗位代码 + /// + public string? reflow_station_code { get; set; } + + /// + /// 维修岗位代码 + /// + public string? repair_station_code { get; set; } + + /// + /// 报废原因 + /// + public string? scrap_cause { get; set; } + + /// + /// 送修线外工序 + /// + public string? from_out_route_code { get; set; } + + /// + /// 维修类型 Normal: 普通, Misjudge: 误判 + /// + public string? repair_type { get; set; } + + /// + /// RMA单号 + /// + public string? rma_bill_code { get; set; } + + /// + /// 维修人员ID + /// + public string? repair_user_id { get; set; } + + /// + /// 维修人员姓名 + /// + public string? repair_user_name { get; set; } + + /// + /// 维修时间 + /// + public DateTime? repair_time { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorCode.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorCode.cs index 77068f8c..45657300 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorCode.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorCode.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修不良代码 +/// +[SugarTable("prd_repair_error_code")] +public partial class PrdRepairErrorCode : BaseEntity { - /// - ///维修不良代码 - /// - [SugarTable("prd_repair_error_code")] - public partial class PrdRepairErrorCode + public PrdRepairErrorCode() { - public PrdRepairErrorCode(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:GUID - /// Default: - /// Nullable:False - /// - public string repair_id {get;set;} = string.Empty; - - /// - /// Desc:不良代码组 - /// Default: - /// Nullable:False - /// - public string error_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良代码 - /// Default: - /// Nullable:False - /// - public string error_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品分类代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// GUID + /// + public string repair_id { get; set; } = string.Empty; + + /// + /// 不良代码组 + /// + public string error_group_code { get; set; } = string.Empty; + + /// + /// 不良代码 + /// + public string error_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品分类代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcause.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcause.cs index f1c4d594..d396d411 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcause.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcause.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修不良原因 +/// +[SugarTable("prd_repair_errorcause")] +public partial class PrdRepairErrorcause : BaseEntity { - /// - ///维修不良原因 - /// - [SugarTable("prd_repair_errorcause")] - public partial class PrdRepairErrorcause + public PrdRepairErrorcause() { - public PrdRepairErrorcause(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:GUID - /// Default: - /// Nullable:False - /// - public string repair_id {get;set;} = string.Empty; - - /// - /// Desc:不良代码组 - /// Default: - /// Nullable:False - /// - public string error_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良代码 - /// Default: - /// Nullable:False - /// - public string error_code {get;set;} = string.Empty; - - /// - /// Desc:不良原因组代码 - /// Default: - /// Nullable:False - /// - public string error_cause_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良原因代码 - /// Default: - /// Nullable:False - /// - public string error_cause_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:维修资源代码 - /// Default: - /// Nullable:False - /// - public string r_station_code {get;set;} = string.Empty; - - /// - /// Desc:维修工序代码 - /// Default: - /// Nullable:False - /// - public string r_process_code {get;set;} = string.Empty; - - /// - /// Desc:解决方案代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? solution_code {get;set;} - - /// - /// Desc:责任类别代码 - /// Default: - /// Nullable:False - /// - public string duty_code {get;set;} = string.Empty; - - /// - /// Desc:解决方法 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? solution_memo {get;set;} - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// GUID + /// + public string repair_id { get; set; } = string.Empty; + + /// + /// 不良代码组 + /// + public string error_group_code { get; set; } = string.Empty; + + /// + /// 不良代码 + /// + public string error_code { get; set; } = string.Empty; + + /// + /// 不良原因组代码 + /// + public string error_cause_group_code { get; set; } = string.Empty; + + /// + /// 不良原因代码 + /// + public string error_cause_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 维修资源代码 + /// + public string r_station_code { get; set; } = string.Empty; + + /// + /// 维修工序代码 + /// + public string r_process_code { get; set; } = string.Empty; + + /// + /// 解决方案代码 + /// + public string? solution_code { get; set; } + + /// + /// 责任类别代码 + /// + public string duty_code { get; set; } = string.Empty; + + /// + /// 解决方法 + /// + public string? solution_memo { get; set; } + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseCom.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseCom.cs index 7f9b0a71..6d4c5841 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseCom.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseCom.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修不良原因和不良组件之间的关系 +/// +[SugarTable("prd_repair_errorcause_com")] +public partial class PrdRepairErrorcauseCom : BaseEntity { - /// - ///维修不良原因和不良组件之间的关系 - /// - [SugarTable("prd_repair_errorcause_com")] - public partial class PrdRepairErrorcauseCom + public PrdRepairErrorcauseCom() { - public PrdRepairErrorcauseCom(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:GUID - /// Default: - /// Nullable:False - /// - public string repair_id {get;set;} = string.Empty; - - /// - /// Desc:不良代码组 - /// Default: - /// Nullable:False - /// - public string error_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良代码 - /// Default: - /// Nullable:False - /// - public string error_code {get;set;} = string.Empty; - - /// - /// Desc:不良原因组代码 - /// Default: - /// Nullable:False - /// - public string error_cause_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良原因代码 - /// Default: - /// Nullable:False - /// - public string error_cause_code {get;set;} = string.Empty; - - /// - /// Desc:不良组件名称 - /// Default: - /// Nullable:False - /// - public string component_name {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:维修资源代码 - /// Default: - /// Nullable:False - /// - public string r_station_code {get;set;} = string.Empty; - - /// - /// Desc:维修工序代码 - /// Default: - /// Nullable:False - /// - public string r_process_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// GUID + /// + public string repair_id { get; set; } = string.Empty; + + /// + /// 不良代码组 + /// + public string error_group_code { get; set; } = string.Empty; + + /// + /// 不良代码 + /// + public string error_code { get; set; } = string.Empty; + + /// + /// 不良原因组代码 + /// + public string error_cause_group_code { get; set; } = string.Empty; + + /// + /// 不良原因代码 + /// + public string error_cause_code { get; set; } = string.Empty; + + /// + /// 不良组件名称 + /// + public string component_name { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 维修资源代码 + /// + public string r_station_code { get; set; } = string.Empty; + + /// + /// 维修工序代码 + /// + public string r_process_code { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseMat.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseMat.cs index d3d449ba..2b7f2580 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseMat.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairErrorcauseMat.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修不良原因和不良物料之间的关系 +/// +[SugarTable("prd_repair_errorcause_mat")] +public partial class PrdRepairErrorcauseMat : BaseEntity { - /// - ///维修不良原因和不良物料之间的关系 - /// - [SugarTable("prd_repair_errorcause_mat")] - public partial class PrdRepairErrorcauseMat + public PrdRepairErrorcauseMat() { - public PrdRepairErrorcauseMat(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:GUID - /// Default: - /// Nullable:False - /// - public string repair_id {get;set;} = string.Empty; - - /// - /// Desc:不良代码组 - /// Default: - /// Nullable:False - /// - public string error_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良代码 - /// Default: - /// Nullable:False - /// - public string error_code {get;set;} = string.Empty; - - /// - /// Desc:不良原因代码 - /// Default: - /// Nullable:False - /// - public string error_cause_group_code {get;set;} = string.Empty; - - /// - /// Desc:不良原因代码 - /// Default: - /// Nullable:False - /// - public string error_cause_code {get;set;} = string.Empty; - - /// - /// Desc:不良物料代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:维修资源代码 - /// Default: - /// Nullable:False - /// - public string r_station_code {get;set;} = string.Empty; - - /// - /// Desc:维修工序代码 - /// Default: - /// Nullable:False - /// - public string r_process_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// GUID + /// + public string repair_id { get; set; } = string.Empty; + + /// + /// 不良代码组 + /// + public string error_group_code { get; set; } = string.Empty; + + /// + /// 不良代码 + /// + public string error_code { get; set; } = string.Empty; + + /// + /// 不良原因代码 + /// + public string error_cause_group_code { get; set; } = string.Empty; + + /// + /// 不良原因代码 + /// + public string error_cause_code { get; set; } = string.Empty; + + /// + /// 不良物料代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 维修资源代码 + /// + public string r_station_code { get; set; } = string.Empty; + + /// + /// 维修工序代码 + /// + public string r_process_code { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairReflow.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairReflow.cs index 66fe9229..63512029 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairReflow.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdRepairReflow.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 维修回流工序 +/// +[SugarTable("prd_repair_reflow")] +public partial class PrdRepairReflow : BaseEntity { - /// - ///维修回流工序 - /// - [SugarTable("prd_repair_reflow")] - public partial class PrdRepairReflow + public PrdRepairReflow() { - public PrdRepairReflow(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:GUID - /// Default: - /// Nullable:False - /// - public string repair_id {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工序顺序 - /// Default: - /// Nullable:False - /// - public int process_seq {get;set;} - - /// - /// Desc:是否已回流执行 - /// Default: - /// Nullable:False - /// - public int is_pass {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// GUID + /// + public string repair_id { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工序顺序 + /// + public int process_seq { get; set; } + + /// + /// 是否已回流执行 + /// + public int is_pass { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs index 10ae4da7..1763bbe3 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 生产提报记录 +/// +[SugarTable("prd_report")] +public partial class PrdReport : BaseEntity { - /// - ///生产提报记录 - /// - [SugarTable("prd_report")] - public partial class PrdReport + public PrdReport() { - public PrdReport(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:生产任务Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_task_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:生产数量 - /// Default: - /// Nullable:True - /// - public int? prd_qty {get;set;} - - /// - /// Desc:已报工数量 - /// Default: - /// Nullable:True - /// - public int? reported_work_qty {get;set;} - - /// - /// Desc:报工数量 - /// Default: - /// Nullable:True - /// - public int? reported_qty {get;set;} - - /// - /// Desc:生产任务编码 - /// Default: - /// Nullable:True - /// - public string? mo_task_code {get;set;} - - /// - /// Desc:生产任务量 - /// Default: - /// Nullable:True - /// - public int? icmo_qty {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 生产任务Id + /// + public string? mo_task_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public DateTime? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 生产数量 + /// + public int? prd_qty { get; set; } + + /// + /// 已报工数量 + /// + public int? reported_work_qty { get; set; } + + /// + /// 报工数量 + /// + public int? reported_qty { get; set; } + + /// + /// 生产任务编码 + /// + public string? mo_task_code { get; set; } + + /// + /// 生产任务量 + /// + public int? icmo_qty { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReportRecord.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReportRecord.cs index db13f208..4113a839 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReportRecord.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReportRecord.cs @@ -1,84 +1,57 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// +/// +[SugarTable("prd_report_record")] +public partial class PrdReportRecord : BaseEntity { - /// - /// - /// - [SugarTable("prd_report_record")] - public partial class PrdReportRecord + public PrdReportRecord() { - public PrdReportRecord(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:产品编码 - /// Default: - /// Nullable:True - /// - public string? masterial_code {get;set;} - - /// - /// Desc:产品名称 - /// Default: - /// Nullable:True - /// - public string? masterial_name {get;set;} - - /// - /// Desc:设备编码 - /// Default: - /// Nullable:True - /// - public string? eqp_code {get;set;} - - /// - /// Desc:计划开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_start_date {get;set;} - - /// - /// Desc:计划结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_end_date {get;set;} - - /// - /// Desc:计划生产数量 - /// Default: - /// Nullable:True - /// - public int? plan_qty {get;set;} - - /// - /// Desc:完成数量 - /// Default: - /// Nullable:True - /// - public int? completed_qty {get;set;} - - /// - /// Desc:任务单号 - /// Default: - /// Nullable:True - /// - public string? mo_task_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 产品编码 + /// + public string? masterial_code { get; set; } + + /// + /// 产品名称 + /// + public string? masterial_name { get; set; } + + /// + /// 设备编码 + /// + public string? eqp_code { get; set; } + + /// + /// 计划开始时间 + /// + public DateTime? plan_start_date { get; set; } + + /// + /// 计划结束时间 + /// + public DateTime? plan_end_date { get; set; } + + /// + /// 计划生产数量 + /// + public int? plan_qty { get; set; } + + /// + /// 完成数量 + /// + public int? completed_qty { get; set; } + + /// + /// 任务单号 + /// + public string? mo_task_code { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworkrange.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworkrange.cs index 24311da6..3aacef32 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworkrange.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworkrange.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 返工需求单下的产品 +/// +[SugarTable("prd_reworkrange")] +public partial class PrdReworkrange : BaseEntity { - /// - ///返工需求单下的产品 - /// - [SugarTable("prd_reworkrange")] - public partial class PrdReworkrange + public PrdReworkrange() { - public PrdReworkrange(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:P返工需求单ID - /// Default: - /// Nullable:False - /// - public string rework_id {get;set;} = string.Empty; - - /// - /// Desc:返工需求单代码 - /// Default: - /// Nullable:False - /// - public string rework_code {get;set;} = string.Empty; - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// P返工需求单ID + /// + public string rework_id { get; set; } = string.Empty; + + /// + /// 返工需求单代码 + /// + public string rework_code { get; set; } = string.Empty; + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworksheet.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworksheet.cs index cd273eb5..d6d41336 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworksheet.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReworksheet.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 返工需求单 +/// +[SugarTable("prd_reworksheet")] +public partial class PrdReworksheet : BaseEntity { - /// - ///返工需求单 - /// - [SugarTable("prd_reworksheet")] - public partial class PrdReworksheet + public PrdReworksheet() { - public PrdReworksheet(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:返工需求单代码 - /// Default: - /// Nullable:False - /// - public string rework_code {get;set;} = string.Empty; - - /// - /// Desc:返工类型： 1：OnLine在线返工, 2：QCReject判退返工 - /// Default: - /// Nullable:False - /// - public string rework_type {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:产品附属信息 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? item_attribute {get;set;} - - /// - /// Desc:返工需求单状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:返工工艺路线 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? rework_route {get;set;} - - /// - /// Desc:返工工艺路线版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? rework_route_version {get;set;} - - /// - /// Desc:返工BOM版本 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? rework_bom_version {get;set;} - - /// - /// Desc:返工数量 - /// Default: - /// Nullable:False - /// - public decimal rework_qty {get;set;} - - /// - /// Desc:返工责任别 - /// Default: - /// Nullable:False - /// - public string duty_code {get;set;} = string.Empty; - - /// - /// Desc:QC判退批号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? qc_lot {get;set;} - - /// - /// Desc:返工情况说明 - /// Default: - /// Nullable:False - /// - public string rework_reason {get;set;} = string.Empty; - - /// - /// Desc:返工不良分析 - /// Default: - /// Nullable:False - /// - public string reason_analyse {get;set;} = string.Empty; - - /// - /// Desc:返工解决方案 - /// Default: - /// Nullable:False - /// - public string solution {get;set;} = string.Empty; - - /// - /// Desc:是否需要签核 - /// Default: - /// Nullable:False - /// - public string need_check {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 返工需求单代码 + /// + public string rework_code { get; set; } = string.Empty; + + /// + /// 返工类型： 1：OnLine在线返工, 2：QCReject判退返工 + /// + public string rework_type { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 产品附属信息 + /// + public string? item_attribute { get; set; } + + /// + /// 返工需求单状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 返工工艺路线 + /// + public string? rework_route { get; set; } + + /// + /// 返工工艺路线版本 + /// + public string? rework_route_version { get; set; } + + /// + /// 返工BOM版本 + /// + public string? rework_bom_version { get; set; } + + /// + /// 返工数量 + /// + public decimal rework_qty { get; set; } + + /// + /// 返工责任别 + /// + public string duty_code { get; set; } = string.Empty; + + /// + /// QC判退批号 + /// + public string? qc_lot { get; set; } + + /// + /// 返工情况说明 + /// + public string rework_reason { get; set; } = string.Empty; + + /// + /// 返工不良分析 + /// + public string reason_analyse { get; set; } = string.Empty; + + /// + /// 返工解决方案 + /// + public string solution { get; set; } = string.Empty; + + /// + /// 是否需要签核 + /// + public string need_check { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSerialBook.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSerialBook.cs index cee9cfb7..8a2783b2 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSerialBook.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSerialBook.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 标签序列号流水记录表 +/// +[SugarTable("prd_serial_book")] +public partial class PrdSerialBook : BaseEntity { - /// - ///标签序列号流水记录表 - /// - [SugarTable("prd_serial_book")] - public partial class PrdSerialBook + public PrdSerialBook() { - public PrdSerialBook(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:条码类型 - /// Default: - /// Nullable:False - /// - public string sn_type {get;set;} = string.Empty; - - /// - /// Desc:前缀 - /// Default: - /// Nullable:False - /// - public string prefix {get;set;} = string.Empty; - - /// - /// Desc:年度 - /// Default: - /// Nullable:False - /// - public int year {get;set;} - - /// - /// Desc:季度 - /// Default: - /// Nullable:False - /// - public int quarter {get;set;} - - /// - /// Desc:月份 - /// Default: - /// Nullable:False - /// - public int month {get;set;} - - /// - /// Desc:周别 - /// Default: - /// Nullable:False - /// - public int week {get;set;} - - /// - /// Desc:日期 - /// Default: - /// Nullable:False - /// - public int date {get;set;} - - /// - /// Desc:最大流水号 - /// Default: - /// Nullable:False - /// - public string max_serial {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 条码类型 + /// + public string sn_type { get; set; } = string.Empty; + + /// + /// 前缀 + /// + public string prefix { get; set; } = string.Empty; + + /// + /// 年度 + /// + public int year { get; set; } + + /// + /// 季度 + /// + public int quarter { get; set; } + + /// + /// 月份 + /// + public int month { get; set; } + + /// + /// 周别 + /// + public int week { get; set; } + + /// + /// 日期 + /// + public int date { get; set; } + + /// + /// 最大流水号 + /// + public string max_serial { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulation.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulation.cs index 8d3de537..121b42a9 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulation.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulation.cs @@ -1,231 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 在制品信息 +/// +[SugarTable("prd_simulation")] +public partial class PrdSimulation : BaseEntity { - /// - ///在制品信息 - /// - [SugarTable("prd_simulation")] - public partial class PrdSimulation + public PrdSimulation() { - public PrdSimulation(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? r_card {get;set;} - - /// - /// Desc:产品序列号过站次序 - /// Default: - /// Nullable:False - /// - public int r_card_seq {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号 - /// Default: - /// Nullable:False - /// - public string source_card {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号流水号 - /// Default: - /// Nullable:False - /// - public int source_card_seq {get;set;} - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:装箱条码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carton_code {get;set;} - - /// - /// Desc:抽检批号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? lot_no {get;set;} - - /// - /// Desc:产品状态 - /// Default: - /// Nullable:False - /// - public string product_status {get;set;} = string.Empty; - - /// - /// Desc:最后过站事件代码 - /// Default: - /// Nullable:False - /// - public string last_action {get;set;} = string.Empty; - - /// - /// Desc:过站事件列表 - /// Default: - /// Nullable:False - /// - public string action_list {get;set;} = string.Empty; - - /// - /// Desc:NG总次数 - /// Default: - /// Nullable:False - /// - public int ng_times {get;set;} - - /// - /// Desc:过站开始时间 - /// Default: - /// Nullable:False - /// - public DateTime begin_time {get;set;} - - /// - /// Desc:过站结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:是否完工 - /// Default: - /// Nullable:False - /// - public int is_complete {get;set;} - - /// - /// Desc:员工表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? staffs {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string? r_card { get; set; } + + /// + /// 产品序列号过站次序 + /// + public int r_card_seq { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号 + /// + public string source_card { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号流水号 + /// + public int source_card_seq { get; set; } + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 关联比例 + /// + public decimal relation_qty { get; set; } + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 装箱条码 + /// + public string? carton_code { get; set; } + + /// + /// 抽检批号 + /// + public string? lot_no { get; set; } + + /// + /// 产品状态 + /// + public string product_status { get; set; } = string.Empty; + + /// + /// 最后过站事件代码 + /// + public string last_action { get; set; } = string.Empty; + + /// + /// 过站事件列表 + /// + public string action_list { get; set; } = string.Empty; + + /// + /// NG总次数 + /// + public int ng_times { get; set; } + + /// + /// 过站开始时间 + /// + public DateTime begin_time { get; set; } = DateTime.Now; + + /// + /// 过站结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 是否完工 + /// + public int is_complete { get; set; } + + /// + /// 员工表 + /// + public string? staffs { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulationreport.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulationreport.cs index 66416621..5d2967f5 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulationreport.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdSimulationreport.cs @@ -1,280 +1,197 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 在制品历史记录 +/// +[SugarTable("prd_simulationreport")] +public partial class PrdSimulationreport : BaseEntity { - /// - ///在制品历史记录 - /// - [SugarTable("prd_simulationreport")] - public partial class PrdSimulationreport + public PrdSimulationreport() { - public PrdSimulationreport(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:产品序列号过站次序 - /// Default: - /// Nullable:False - /// - public int r_card_seq {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号 - /// Default: - /// Nullable:False - /// - public string source_card {get;set;} = string.Empty; - - /// - /// Desc:转换前的产品序列号流水号 - /// Default: - /// Nullable:False - /// - public int source_card_seq {get;set;} - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:关联比例 - /// Default: - /// Nullable:False - /// - public decimal relation_qty {get;set;} - - /// - /// Desc:班制代码 - /// Default: - /// Nullable:False - /// - public string shift_type_code {get;set;} = string.Empty; - - /// - /// Desc:班次代码 - /// Default: - /// Nullable:False - /// - public string shift_code {get;set;} = string.Empty; - - /// - /// Desc:时段代码 - /// Default: - /// Nullable:False - /// - public string tp_code {get;set;} = string.Empty; - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:工厂代码 - /// Default: - /// Nullable:False - /// - public string factory_code {get;set;} = string.Empty; - - /// - /// Desc:工段代码 - /// Default: - /// Nullable:False - /// - public string segment_code {get;set;} = string.Empty; - - /// - /// Desc:产线代码 - /// Default: - /// Nullable:False - /// - public string production_line_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:装箱条码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carton_code {get;set;} - - /// - /// Desc:抽检批号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? lot_no {get;set;} - - /// - /// Desc:产品状态： GOOD, OFFLINE, OFFMO, OUTLINE, NG, REJECT, SCRAP - /// Default: - /// Nullable:False - /// - public string product_status {get;set;} = string.Empty; - - /// - /// Desc:最后过站事件代码 - /// Default: - /// Nullable:False - /// - public string last_action {get;set;} = string.Empty; - - /// - /// Desc:过站事件列表 - /// Default: - /// Nullable:False - /// - public string action_list {get;set;} = string.Empty; - - /// - /// Desc:NG总次数 - /// Default: - /// Nullable:False - /// - public int ng_times {get;set;} - - /// - /// Desc:过站开始时间 - /// Default: - /// Nullable:False - /// - public DateTime begin_time {get;set;} - - /// - /// Desc:过站结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? end_time {get;set;} - - /// - /// Desc:是否完工 - /// Default: - /// Nullable:False - /// - public int is_complete {get;set;} - - /// - /// Desc:员工表 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? staffs {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 产品序列号过站次序 + /// + public int r_card_seq { get; set; } + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号 + /// + public string source_card { get; set; } = string.Empty; + + /// + /// 转换前的产品序列号流水号 + /// + public int source_card_seq { get; set; } + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 关联比例 + /// + public decimal relation_qty { get; set; } + + /// + /// 班制代码 + /// + public string shift_type_code { get; set; } = string.Empty; + + /// + /// 班次代码 + /// + public string shift_code { get; set; } = string.Empty; + + /// + /// 时段代码 + /// + public string tp_code { get; set; } = string.Empty; + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 工厂代码 + /// + public string factory_code { get; set; } = string.Empty; + + /// + /// 工段代码 + /// + public string segment_code { get; set; } = string.Empty; + + /// + /// 产线代码 + /// + public string production_line_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 装箱条码 + /// + public string? carton_code { get; set; } + + /// + /// 抽检批号 + /// + public string? lot_no { get; set; } + + /// + /// 产品状态： GOOD, OFFLINE, OFFMO, OUTLINE, NG, REJECT, SCRAP + /// + public string product_status { get; set; } = string.Empty; + + /// + /// 最后过站事件代码 + /// + public string last_action { get; set; } = string.Empty; + + /// + /// 过站事件列表 + /// + public string action_list { get; set; } = string.Empty; + + /// + /// NG总次数 + /// + public int ng_times { get; set; } + + /// + /// 过站开始时间 + /// + public DateTime begin_time { get; set; } = DateTime.Now; + + /// + /// 过站结束时间 + /// + public DateTime? end_time { get; set; } + + /// + /// 是否完工 + /// + public int is_complete { get; set; } + + /// + /// 员工表 + /// + public string? staffs { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareMaterial.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareMaterial.cs index 652c9590..cd84f07b 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareMaterial.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareMaterial.cs @@ -1,189 +1,132 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批控管料备料（岗位用料信息） +/// +[SugarTable("prd_station_prepare_material")] +public partial class PrdStationPrepareMaterial : BaseEntity { - /// - ///批控管料备料（岗位用料信息） - /// - [SugarTable("prd_station_prepare_material")] - public partial class PrdStationPrepareMaterial + public PrdStationPrepareMaterial() { - public PrdStationPrepareMaterial(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:物料备料顺序（按单个物料进行排序） - /// Default: - /// Nullable:False - /// - public int seq {get;set;} - - /// - /// Desc:工序BOM物料代码(主料) - /// Default: - /// Nullable:False - /// - public string bom_material_code {get;set;} = string.Empty; - - /// - /// Desc:备料物料代码（主料或替代料） - /// Default: - /// Nullable:False - /// - public string prepare_material_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工序BOM版本 - /// Default: - /// Nullable:False - /// - public string process_bom_version {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:最小包装号或半成品的产品序列号，INV_BARCODE.BARCODE - /// Default: - /// Nullable:False - /// - public string material_card {get;set;} = string.Empty; - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:供应商代码 - /// Default: - /// Nullable:False - /// - public string vendor_code {get;set;} = string.Empty; - - /// - /// Desc:供应商LOT号 - /// Default: - /// Nullable:False - /// - public string vendor_lot {get;set;} = string.Empty; - - /// - /// Desc:生产日期（入库日期） - /// Default: - /// Nullable:False - /// - public DateTime date_code {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 物料备料顺序（按单个物料进行排序） + /// + public int seq { get; set; } + + /// + /// 工序BOM物料代码(主料) + /// + public string bom_material_code { get; set; } = string.Empty; + + /// + /// 备料物料代码（主料或替代料） + /// + public string prepare_material_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工序BOM版本 + /// + public string process_bom_version { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 最小包装号或半成品的产品序列号，INV_BARCODE.BARCODE + /// + public string material_card { get; set; } = string.Empty; + + /// + /// 数量 + /// + public decimal qty { get; set; } + + /// + /// 供应商代码 + /// + public string vendor_code { get; set; } = string.Empty; + + /// + /// 供应商LOT号 + /// + public string vendor_lot { get; set; } = string.Empty; + + /// + /// 生产日期（入库日期） + /// + public DateTime date_code { get; set; } = DateTime.Now; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareTool.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareTool.cs index 22bfb080..96cfd2ad 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareTool.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdStationPrepareTool.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 批控管料备料工具 +/// +[SugarTable("prd_station_prepare_tool")] +public partial class PrdStationPrepareTool : BaseEntity { - /// - ///批控管料备料工具 - /// - [SugarTable("prd_station_prepare_tool")] - public partial class PrdStationPrepareTool + public PrdStationPrepareTool() { - public PrdStationPrepareTool(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:工具类型代码 - /// Default: - /// Nullable:False - /// - public string tool_type_code {get;set;} = string.Empty; - - /// - /// Desc:模型代码 - /// Default: - /// Nullable:False - /// - public string model_code {get;set;} = string.Empty; - - /// - /// Desc:工具代码 - /// Default: - /// Nullable:False - /// - public string tool_code {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:False - /// - public string route_code {get;set;} = string.Empty; - - /// - /// Desc:工艺路线版本 - /// Default: - /// Nullable:False - /// - public string route_version {get;set;} = string.Empty; - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:岗位代码 - /// Default: - /// Nullable:False - /// - public string station_code {get;set;} = string.Empty; - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 工具类型代码 + /// + public string tool_type_code { get; set; } = string.Empty; + + /// + /// 模型代码 + /// + public string model_code { get; set; } = string.Empty; + + /// + /// 工具代码 + /// + public string tool_code { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工艺路线代码 + /// + public string route_code { get; set; } = string.Empty; + + /// + /// 工艺路线版本 + /// + public string route_version { get; set; } = string.Empty; + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 岗位代码 + /// + public string station_code { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTestdataTemporary.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTestdataTemporary.cs index e650f045..1496fe37 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTestdataTemporary.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTestdataTemporary.cs @@ -1,210 +1,147 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 生产测试数据临时记录 +/// +[SugarTable("prd_testdata_temporary")] +public partial class PrdTestdataTemporary : BaseEntity { - /// - ///生产测试数据临时记录 - /// - [SugarTable("prd_testdata_temporary")] - public partial class PrdTestdataTemporary + public PrdTestdataTemporary() { - public PrdTestdataTemporary(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:产品序列号 - /// Default: - /// Nullable:False - /// - public string r_card {get;set;} = string.Empty; - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:False - /// - public string mo_code {get;set;} = string.Empty; - - /// - /// Desc:产品类型代码 - /// Default: - /// Nullable:False - /// - public string category_code {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string item_code {get;set;} = string.Empty; - - /// - /// Desc:工作天 - /// Default: - /// Nullable:False - /// - public int shift_day {get;set;} - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:False - /// - public string process_code {get;set;} = string.Empty; - - /// - /// Desc:检验类型代码 - /// Default: - /// Nullable:False - /// - public string check_type_code {get;set;} = string.Empty; - - /// - /// Desc:检验类型名称 - /// Default: - /// Nullable:False - /// - public string check_type_name {get;set;} = string.Empty; - - /// - /// Desc:检验项目代码 - /// Default: - /// Nullable:False - /// - public string check_item_code {get;set;} = string.Empty; - - /// - /// Desc:检验项目名称 - /// Default: - /// Nullable:False - /// - public string check_item_name {get;set;} = string.Empty; - - /// - /// Desc:Value:值检验项/Result:结果检验项 - /// Default: - /// Nullable:False - /// - public string result_type {get;set;} = string.Empty; - - /// - /// Desc:判断类型： 1：Auto自动判断 2：Manual人工判断 - /// Default: - /// Nullable:False - /// - public int judge_type {get;set;} - - /// - /// Desc:单位 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit {get;set;} - - /// - /// Desc:下限值 - /// Default: - /// Nullable:True - /// - public decimal? limit_low {get;set;} - - /// - /// Desc:上限值 - /// Default: - /// Nullable:True - /// - public decimal? limit_high {get;set;} - - /// - /// Desc:标准值 - /// Default: - /// Nullable:True - /// - public decimal? standard {get;set;} - - /// - /// Desc:实际值 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? actual {get;set;} - - /// - /// Desc:结果 - /// Default: - /// Nullable:False - /// - public int result {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 产品序列号 + /// + public string r_card { get; set; } = string.Empty; + + /// + /// 工单代码 + /// + public string mo_code { get; set; } = string.Empty; + + /// + /// 产品类型代码 + /// + public string category_code { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string item_code { get; set; } = string.Empty; + + /// + /// 工作天 + /// + public int shift_day { get; set; } + + /// + /// 工序代码 + /// + public string process_code { get; set; } = string.Empty; + + /// + /// 检验类型代码 + /// + public string check_type_code { get; set; } = string.Empty; + + /// + /// 检验类型名称 + /// + public string check_type_name { get; set; } = string.Empty; + + /// + /// 检验项目代码 + /// + public string check_item_code { get; set; } = string.Empty; + + /// + /// 检验项目名称 + /// + public string check_item_name { get; set; } = string.Empty; + + /// + /// Value:值检验项/Result:结果检验项 + /// + public string result_type { get; set; } = string.Empty; + + /// + /// 判断类型： 1：Auto自动判断 2：Manual人工判断 + /// + public int judge_type { get; set; } + + /// + /// 单位 + /// + public string? unit { get; set; } + + /// + /// 下限值 + /// + public decimal? limit_low { get; set; } + + /// + /// 上限值 + /// + public decimal? limit_high { get; set; } + + /// + /// 标准值 + /// + public decimal? standard { get; set; } + + /// + /// 实际值 + /// + public string? actual { get; set; } + + /// + /// 结果 + /// + public int result { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWarn.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWarn.cs index 33c5f71c..68915abd 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWarn.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWarn.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 设备告警 +/// +[SugarTable("prd_warn")] +public partial class PrdWarn : BaseEntity { - /// - ///设备告警 - /// - [SugarTable("prd_warn")] - public partial class PrdWarn + public PrdWarn() { - public PrdWarn(){ - - - } - /// - /// Desc:编号 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:设备Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_id {get;set;} - - /// - /// Desc:设备编码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_code {get;set;} - - /// - /// Desc:设备名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? eqp_name {get;set;} - - /// - /// Desc:告警编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? warn_code {get;set;} - - /// - /// Desc:告警内容 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? warn_name {get;set;} - - /// - /// Desc:上报时间 - /// Default: - /// Nullable:True - /// - public DateTime? report_time {get;set;} - - /// - /// Desc:消除时间 - /// Default: - /// Nullable:True - /// - public DateTime? eli_time {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:创建用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? create_id {get;set;} - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 设备Id + /// + public string? eqp_id { get; set; } + + /// + /// 设备编码 + /// + public string? eqp_code { get; set; } + + /// + /// 设备名称 + /// + public string? eqp_name { get; set; } + + /// + /// 告警编号 + /// + public string? warn_code { get; set; } + + /// + /// 告警内容 + /// + public string? warn_name { get; set; } + + /// + /// 上报时间 + /// + public DateTime? report_time { get; set; } + + /// + /// 消除时间 + /// + public DateTime? eli_time { get; set; } + + /// + /// 时间戳 + /// + public DateTime? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWorklineState.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWorklineState.cs index c3ff0413..f75c1dc6 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWorklineState.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdWorklineState.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.ProductionMgr.Entities +namespace Tnb.ProductionMgr.Entities; + +/// +/// 产线状态 +/// +[SugarTable("prd_workline_state")] +public partial class PrdWorklineState : BaseEntity { - /// - ///产线状态 - /// - [SugarTable("prd_workline_state")] - public partial class PrdWorklineState + public PrdWorklineState() { - public PrdWorklineState(){ - - - } - /// - /// Desc:产线id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:产线代码 - /// Default: - /// Nullable:True - /// - public string? workline_code {get;set;} - - /// - /// Desc:工单id - /// Default: - /// Nullable:True - /// - public string? mo_id {get;set;} - - /// - /// Desc:工单代码 - /// Default: - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:模具id - /// Default: - /// Nullable:True - /// - public string? mold_id {get;set;} - - /// - /// Desc:工艺路线id - /// Default: - /// Nullable:True - /// - public string? route_id {get;set;} - - /// - /// Desc:工艺路线代码 - /// Default: - /// Nullable:True - /// - public string? route_code {get;set;} - - /// - /// Desc:工序id - /// Default: - /// Nullable:True - /// - public string? process_id {get;set;} - - /// - /// Desc:工序代码 - /// Default: - /// Nullable:True - /// - public string? process_code {get;set;} - - /// - /// Desc:工位id - /// Default: - /// Nullable:True - /// - public string? station_id {get;set;} - - /// - /// Desc:工位代码 - /// Default: - /// Nullable:True - /// - public string? station_code {get;set;} - - /// - /// Desc:当前产品序列号 - /// Default: - /// Nullable:True - /// - public string? lot_no {get;set;} - - /// - /// Desc:需要的物料 - /// Default: - /// Nullable:True - /// - public string? require_material_id {get;set;} - - /// - /// Desc:需要的物料 - /// Default: - /// Nullable:True - /// - public string? require_material_code {get;set;} - - /// - /// Desc:需要的物料 - /// Default: - /// Nullable:True - /// - public string? require_material_name {get;set;} - - /// - /// Desc:需要的物料 - /// Default: - /// Nullable:True - /// - public string? require_material_spec {get;set;} - - /// - /// Desc:当前产品 - /// Default: - /// Nullable:True - /// - public string? product_code {get;set;} - - /// - /// Desc:当前产品 - /// Default: - /// Nullable:True - /// - public string? product_name {get;set;} - - /// - /// Desc:当前产品 - /// Default: - /// Nullable:True - /// - public string? product_spec {get;set;} - - /// - /// Desc:扩展 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:更新时间 - /// Default: - /// Nullable:True - /// - public DateTime? update_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 产线代码 + /// + public string? workline_code { get; set; } + + /// + /// 工单id + /// + public string? mo_id { get; set; } + + /// + /// 工单代码 + /// + public string? mo_code { get; set; } + + /// + /// 模具id + /// + public string? mold_id { get; set; } + + /// + /// 工艺路线id + /// + public string? route_id { get; set; } + + /// + /// 工艺路线代码 + /// + public string? route_code { get; set; } + + /// + /// 工序id + /// + public string? process_id { get; set; } + + /// + /// 工序代码 + /// + public string? process_code { get; set; } + + /// + /// 工位id + /// + public string? station_id { get; set; } + + /// + /// 工位代码 + /// + public string? station_code { get; set; } + + /// + /// 当前产品序列号 + /// + public string? lot_no { get; set; } + + /// + /// 需要的物料 + /// + public string? require_material_id { get; set; } + + /// + /// 需要的物料 + /// + public string? require_material_code { get; set; } + + /// + /// 需要的物料 + /// + public string? require_material_name { get; set; } + + /// + /// 需要的物料 + /// + public string? require_material_spec { get; set; } + + /// + /// 当前产品 + /// + public string? product_code { get; set; } + + /// + /// 当前产品 + /// + public string? product_name { get; set; } + + /// + /// 当前产品 + /// + public string? product_spec { get; set; } + + /// + /// 扩展 + /// + public string? extras { get; set; } + + /// + /// 更新时间 + /// + public DateTime? update_time { get; set; } + } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs index 6311fe63..314e66d1 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs @@ -25,7 +25,6 @@ using Senparc.Weixin.Work.AdvancedAPIs.MailList; using SqlSugar; using Tnb.BasicData; using Tnb.BasicData.Entities; -using Tnb.BasicData.Entitys.Entity; using Tnb.EquipMgr.Entities; using Tnb.ProductionMgr.Entities; using Tnb.ProductionMgr.Entities.Dto; @@ -188,7 +187,7 @@ namespace Tnb.ProductionMgr { (bool executeRes, string errMsg) multi = (true, ""); var list = await _repository.AsSugarClient().Queryable() - .InnerJoin((a, b) => a.material_id == b.material_id) + .InnerJoin((a, b) => a.material_id == b.material_id) .Where((a, b) => input.WorkOrderIds.Contains(a.id)) .Select((a, b) => new { diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs index c7f02960..eb9b1f2e 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs @@ -70,7 +70,7 @@ namespace Tnb.ProductionMgr if (dic.ContainsKey("mold_id")) { var moldId = dic["mold_id"]?.ToString(); - var mold = await db.Queryable().FirstAsync(it => it.id == moldId); + var mold = await db.Queryable().FirstAsync(it => it.id == moldId); if (mold != null) { row["mold_id"] = $"{mold.mold_code}/{mold.mold_name}"; diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index febdea50..a00115da 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -99,7 +99,7 @@ namespace Tnb.ProductionMgr public async Task GetMoldListByItemId(string materialId) { var db = _repository.AsSugarClient(); - var list = await db.Queryable().InnerJoin((a, b) => a.material_id == b.id) + var list = await db.Queryable().InnerJoin((a, b) => a.material_id == b.id) .Where((a, b) => a.material_id == materialId) .Select((a, b) => new MoldListOutput { @@ -170,7 +170,7 @@ namespace Tnb.ProductionMgr var list = await _repository.AsSugarClient().Queryable() .LeftJoin((a, b) => a.mo_id == b.id) .LeftJoin((a, b, c) => a.material_id == c.id) - .LeftJoin((a, b, c, d) => a.mold_id == d.id) + .LeftJoin((a, b, c, d) => a.mold_id == d.id) .Where((a, b, c, d) => a.eqp_id == eqpId) .OrderBy((a, b, c, d) => a.estimated_start_date) .Select((a, b, c, d) => new PrdTaskSortOutput @@ -238,7 +238,7 @@ namespace Tnb.ProductionMgr if (prdTask != null) { var eqp = await db.Queryable().FirstAsync(it => it.id == prdTask.eqp_id); - var mold = await db.Queryable().FirstAsync(it => it.id == prdTask.mold_id); + var mold = await db.Queryable().FirstAsync(it => it.id == prdTask.mold_id); var material = await db.Queryable().FirstAsync(it => it.id == prdTask.material_id); eqpCode = eqp != null ? eqp.code : ""; moldCode = mold != null ? mold.mold_code : ""; @@ -349,7 +349,7 @@ namespace Tnb.ProductionMgr { result = await _db.Queryable().LeftJoin((a, b) => a.mo_id == b.id) .LeftJoin((a, b, c) => a.material_id == c.id) - .LeftJoin((a, b, c, d) => a.mold_id == d.id) + .LeftJoin((a, b, c, d) => a.mold_id == d.id) .LeftJoin((a, b, c, d, e) => a.eqp_id == e.id) .Where((a, b, c, d, e) => a.mo_id == moId) .Select((a, b, c, d, e) => new PrdMoTaskOutput @@ -559,7 +559,7 @@ namespace Tnb.ProductionMgr taskLog.id = SnowflakeIdHelper.NextId(); taskLog.mo_code = (await db.Queryable().FirstAsync(it => it.id == input.mo_id))?.mo_code!; taskLog.eqp_code = (await db.Queryable().FirstAsync(it => it.id == input.eqp_id))?.code!; - taskLog.mold_code = (await db.Queryable().FirstAsync(it => it.id == input.mold_id))?.mold_code!; + taskLog.mold_code = (await db.Queryable().FirstAsync(it => it.id == input.mold_id))?.mold_code!; taskLog.item_code = material?.code!; taskLog.item_standard = material?.material_standard!; taskLog.status = DictConst.ToBeScheduledEncode; @@ -576,7 +576,7 @@ namespace Tnb.ProductionMgr sacipRecord.material_code = material?.code!; sacipRecord.material_name = material?.name!; sacipRecord.eqp_code = (await db.Queryable().FirstAsync(it => it.id == moTask.eqp_id))?.code!; - sacipRecord.mold_name = (await db.Queryable().FirstAsync(it => it.id == moTask.mold_id))?.mold_name!; + sacipRecord.mold_name = (await db.Queryable().FirstAsync(it => it.id == moTask.mold_id))?.mold_name!; sacipRecord.estimated_start_date = moTask.plan_start_date; sacipRecord.estimated_end_date = moTask.plan_end_date; sacipRecord.plan_qty = moTask.plan_qty; @@ -896,7 +896,7 @@ namespace Tnb.ProductionMgr } if (taskItem.mold_id!.IsNotEmptyOrNull()) { - taskLog.mold_code = (await db.Queryable().FirstAsync(it => it.id == taskItem.mold_id))?.mold_code!; + taskLog.mold_code = (await db.Queryable().FirstAsync(it => it.id == taskItem.mold_id))?.mold_code!; } if (taskItem.material_id!.IsNotEmptyOrNull()) { @@ -964,7 +964,7 @@ namespace Tnb.ProductionMgr case 2: //模具 if (icmoItem != null) { - var moldItem = await db.Queryable().FirstAsync(it => it.id == icmoItem.mold_id); + var moldItem = await db.Queryable().FirstAsync(it => it.id == icmoItem.mold_id); icmoItem.mold_id = moldItem.id; icmoItem.mold_code = moldItem.mold_code; icmoItem.mold_name = moldItem.mold_name; @@ -1135,7 +1135,7 @@ namespace Tnb.ProductionMgr if (dic.ContainsKey("mold_id")) { var moldId = dic["mold_id"]?.ToString(); - var mold = await db.Queryable().FirstAsync(it => it.id == moldId); + var mold = await db.Queryable().FirstAsync(it => it.id == moldId); if (mold != null) { row["mold_id"] = $"{mold.mold_code}/{mold.mold_name}"; diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs index 9183256f..f654c1eb 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs @@ -77,7 +77,7 @@ namespace Tnb.ProductionMgr if (dic.ContainsKey("mold_id")) { var moldId = dic["mold_id"]?.ToString(); - var mold = await db.Queryable().FirstAsync(it => it.id == moldId); + var mold = await db.Queryable().FirstAsync(it => it.id == moldId); if (mold != null) { row["mold_id"] = $"{mold.mold_code}/{mold.mold_name}"; diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Class1.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Class1.cs deleted file mode 100644 index 9eafdca9..00000000 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Tnb.WarehouseMgr.Entities -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaD.cs index e920fb79..2fd6133e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaD.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 路径管理区设备明细表 +/// +[SugarTable("wms_area_d")] +public partial class WmsAreaD : BaseEntity { - /// - ///路径管理区设备明细表 - /// - [SugarTable("wms_area_d")] - public partial class WmsAreaD + public WmsAreaD() { - public WmsAreaD(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:主表ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? area_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:设备ID - /// Default: - /// Nullable:False - /// - public string eqpt_id {get;set;} = string.Empty; - - /// - /// Desc:设备编号 - /// Default: - /// Nullable:False - /// - public string eqpt_code {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 主表ID + /// + public string? area_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 设备ID + /// + public string eqpt_id { get; set; } = string.Empty; + + /// + /// 设备编号 + /// + public string eqpt_code { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs index 45e7e768..844c7daa 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsAreaH.cs @@ -1,112 +1,77 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 路径管理区主表 +/// +[SugarTable("wms_area_h")] +public partial class WmsAreaH : BaseEntity { - /// - ///路径管理区主表 - /// - [SugarTable("wms_area_h")] - public partial class WmsAreaH + public WmsAreaH() { - public WmsAreaH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:管理区代码 - /// Default: - /// Nullable:False - /// - public string code {get;set;} = string.Empty; - - /// - /// Desc:管理区名称 - /// Default: - /// Nullable:False - /// - public string name {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:单次搬运数量 - /// Default: - /// Nullable:False - /// - public int move_num {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 管理区代码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 管理区名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 单次搬运数量 + /// + public int move_num { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs index 81df65bb..b71ca2b2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具台账条码表 +/// +[SugarTable("wms_carry_code")] +public partial class WmsCarryCode : BaseEntity { - /// - ///载具台账条码表 - /// - [SugarTable("wms_carry_code")] - public partial class WmsCarryCode + public WmsCarryCode() { - public WmsCarryCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:上级载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_id {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - - /// - /// Desc:是否出库 - /// Default: - /// Nullable:False - /// - public int is_out {get;set;} - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:库位编号 - /// Default: - /// Nullable:False - /// - public string location_code {get;set;} = string.Empty; - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 上级载具ID + /// + public string? carry_id { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + + /// + /// 是否出库 + /// + public int is_out { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 库位编号 + /// + public string location_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryD.cs index c8dc26f2..0bfbdd28 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryD.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具台账明细表 +/// +[SugarTable("wms_carry_d")] +public partial class WmsCarryD : BaseEntity { - /// - ///载具台账明细表 - /// - [SugarTable("wms_carry_d")] - public partial class WmsCarryD + public WmsCarryD() { - public WmsCarryD(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:上级载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:子载具ID - /// Default: - /// Nullable:False - /// - public string membercarry_id {get;set;} = string.Empty; - - /// - /// Desc:子载具编号 - /// Default: - /// Nullable:False - /// - public string membercarry_code {get;set;} = string.Empty; - - /// - /// Desc:位置 - /// Default: - /// Nullable:False - /// - public string loc {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 上级载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 子载具ID + /// + public string membercarry_id { get; set; } = string.Empty; + + /// + /// 子载具编号 + /// + public string membercarry_code { get; set; } = string.Empty; + + /// + /// 位置 + /// + public string loc { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs index 00f5dd8b..30b9e324 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具台账主表 +/// +[SugarTable("wms_carry_h")] +public partial class WmsCarryH : BaseEntity { - /// - ///载具台账主表 - /// - [SugarTable("wms_carry_h")] - public partial class WmsCarryH + public WmsCarryH() { - public WmsCarryH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:载具名称 - /// Default: - /// Nullable:False - /// - public string carry_name {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:载具状态 - /// Default: - /// Nullable:False - /// - public string carry_status {get;set;} = string.Empty; - - /// - /// Desc:载具分类ID - /// Default: - /// Nullable:False - /// - public string carrystd_id {get;set;} = string.Empty; - - /// - /// Desc:载具库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - - /// - /// Desc:载具库位编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_code {get;set;} - - /// - /// Desc:是否锁定 - /// Default: - /// Nullable:False - /// - public int is_lock {get;set;} - - /// - /// Desc:出库类型 - /// Default: - /// Nullable:False - /// - public string out_status {get;set;} = string.Empty; - - /// - /// Desc:是否检验 - /// Default: - /// Nullable:False - /// - public int is_check {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 载具名称 + /// + public string carry_name { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 载具状态 + /// + public string carry_status { get; set; } = string.Empty; + + /// + /// 载具分类ID + /// + public string carrystd_id { get; set; } = string.Empty; + + /// + /// 载具库位ID + /// + public string? location_id { get; set; } + + /// + /// 载具库位编号 + /// + public string? location_code { get; set; } + + /// + /// 是否锁定 + /// + public int is_lock { get; set; } + + /// + /// 出库类型 + /// + public string out_status { get; set; } = string.Empty; + + /// + /// 是否检验 + /// + public int is_check { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryMat.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryMat.cs index 240a1706..e1d544cc 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryMat.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryMat.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具台账物料明细表 +/// +[SugarTable("wms_carry_mat")] +public partial class WmsCarryMat : BaseEntity { - /// - ///载具台账物料明细表 - /// - [SugarTable("wms_carry_mat")] - public partial class WmsCarryMat + public WmsCarryMat() { - public WmsCarryMat(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:上级载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:物料ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:物料数量 - /// Default: - /// Nullable:False - /// - public int qty {get;set;} - - /// - /// Desc:需要出库数量 - /// Default: - /// Nullable:False - /// - public int need_qty {get;set;} - - /// - /// Desc:实际已出库数量 - /// Default: - /// Nullable:False - /// - public int real_qty {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - public DateTime? create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 上级载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 物料ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物料代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 物料数量 + /// + public int qty { get; set; } + + /// + /// 需要出库数量 + /// + public int need_qty { get; set; } + + /// + /// 实际已出库数量 + /// + public int real_qty { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceCode.cs index 27658beb..2575f6af 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceCode.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具更换条码明细表 +/// +[SugarTable("wms_carry_replace_code")] +public partial class WmsCarryReplaceCode : BaseEntity { - /// - ///载具更换条码明细表 - /// - [SugarTable("wms_carry_replace_code")] - public partial class WmsCarryReplaceCode + public WmsCarryReplaceCode() { - public WmsCarryReplaceCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:更换单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 更换单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceH.cs index 7ce2b9f6..f2d39eae 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryReplaceH.cs @@ -1,119 +1,82 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具更换主表 +/// +[SugarTable("wms_carry_replace_h")] +public partial class WmsCarryReplaceH : BaseEntity { - /// - ///载具更换主表 - /// - [SugarTable("wms_carry_replace_h")] - public partial class WmsCarryReplaceH + public WmsCarryReplaceH() { - public WmsCarryReplaceH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:新载具ID - /// Default: - /// Nullable:False - /// - public string newcarry_id {get;set;} = string.Empty; - - /// - /// Desc:新载具编号 - /// Default: - /// Nullable:False - /// - public string newcarry_code {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string tenant_id { get; set; } = string.Empty; + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 新载具ID + /// + public string newcarry_id { get; set; } = string.Empty; + + /// + /// 新载具编号 + /// + public string newcarry_code { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindCode.cs index c0041f1e..2632aeb7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具绑定记录条码明细表 +/// +[SugarTable("wms_carrybind_code")] +public partial class WmsCarrybindCode : BaseEntity { - /// - ///载具绑定记录条码明细表 - /// - [SugarTable("wms_carrybind_code")] - public partial class WmsCarrybindCode + public WmsCarrybindCode() { - public WmsCarrybindCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:绑定记录ID - /// Default: - /// Nullable:False - /// - public string carrybind_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? barcode {get;set;} - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:True - /// - public int? codeqty {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:True - /// - public int? no {get;set;} - - /// - /// Desc:子载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_id {get;set;} - - /// - /// Desc:子载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_code {get;set;} - - /// - /// Desc:单位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_id {get;set;} - - /// - /// Desc:单位代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 绑定记录ID + /// + public string carrybind_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string? barcode { get; set; } + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int? codeqty { get; set; } + + /// + /// 行号 + /// + public int? no { get; set; } + + /// + /// 子载具ID + /// + public string? membercarry_id { get; set; } + + /// + /// 子载具编号 + /// + public string? membercarry_code { get; set; } + + /// + /// 单位ID + /// + public string? unit_id { get; set; } + + /// + /// 单位代码 + /// + public string? unit_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs index 98130dad..540102b2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具绑定记录主表 +/// +[SugarTable("wms_carrybind_h")] +public partial class WmsCarrybindH : BaseEntity { - /// - ///载具绑定记录主表 - /// - [SugarTable("wms_carrybind_h")] - public partial class WmsCarrybindH + public WmsCarrybindH() { - public WmsCarrybindH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:载具名称 - /// Default: - /// Nullable:False - /// - public string carry_name {get;set;} = string.Empty; - - /// - /// Desc:dataType - /// Default: - /// Nullable:False - /// - public int biz_type {get;set;} - - /// - /// Desc:载具分类ID - /// Default: - /// Nullable:False - /// - public string carrystd_id {get;set;} = string.Empty; - - /// - /// Desc:载具库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - - /// - /// Desc:载具库位编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_code {get;set;} - - /// - /// Desc:子载具ID - /// Default: - /// Nullable:False - /// - public string membercarry_id {get;set;} = string.Empty; - - /// - /// Desc:子载具编号 - /// Default: - /// Nullable:False - /// - public string membercarry_code {get;set;} = string.Empty; - - /// - /// Desc:位置 - /// Default: - /// Nullable:False - /// - public int loc {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:设备ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? ept_id {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 载具名称 + /// + public string carry_name { get; set; } = string.Empty; + + /// + /// dataType + /// + public int biz_type { get; set; } + + /// + /// 载具分类ID + /// + public string carrystd_id { get; set; } = string.Empty; + + /// + /// 载具库位ID + /// + public string? location_id { get; set; } + + /// + /// 载具库位编号 + /// + public string? location_code { get; set; } + + /// + /// 子载具ID + /// + public string membercarry_id { get; set; } = string.Empty; + + /// + /// 子载具编号 + /// + public string membercarry_code { get; set; } = string.Empty; + + /// + /// 位置 + /// + public int loc { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 设备ID + /// + public string? ept_id { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystd.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystd.cs index 1ecf88d6..bfcec6ec 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystd.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystd.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具规格 +/// +[SugarTable("wms_carrystd")] +public partial class WmsCarrystd : BaseEntity { - /// - ///载具规格 - /// - [SugarTable("wms_carrystd")] - public partial class WmsCarrystd + public WmsCarrystd() { - public WmsCarrystd(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:载具规格编号 - /// Default: - /// Nullable:False - /// - public string carrystd_code {get;set;} = string.Empty; - - /// - /// Desc:载具规格名称 - /// Default: - /// Nullable:False - /// - public string carrystd_name {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 载具规格编号 + /// + public string carrystd_code { get; set; } = string.Empty; + + /// + /// 载具规格名称 + /// + public string carrystd_name { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystdandloc.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystdandloc.cs index 07b89290..d2e33501 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystdandloc.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrystdandloc.cs @@ -1,98 +1,67 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具库位设定 +/// +[SugarTable("wms_carrystdandloc")] +public partial class WmsCarrystdandloc : BaseEntity { - /// - ///载具库位设定 - /// - [SugarTable("wms_carrystdandloc")] - public partial class WmsCarrystdandloc + public WmsCarrystdandloc() { - public WmsCarrystdandloc(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:载具规格ID - /// Default: - /// Nullable:False - /// - public string carrystd_id {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string tenant_id { get; set; } = string.Empty; + + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 载具规格ID + /// + public string carrystd_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindCode.cs index 561be091..b6671e15 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具解绑记录条码明细表 +/// +[SugarTable("wms_carryunbind_code")] +public partial class WmsCarryunbindCode : BaseEntity { - /// - ///载具解绑记录条码明细表 - /// - [SugarTable("wms_carryunbind_code")] - public partial class WmsCarryunbindCode + public WmsCarryunbindCode() { - public WmsCarryunbindCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:解绑记录ID - /// Default: - /// Nullable:False - /// - public string carryunbind_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? barcode {get;set;} - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:True - /// - public int? codeqty {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:True - /// - public int? no {get;set;} - - /// - /// Desc:子载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_id {get;set;} - - /// - /// Desc:子载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_code {get;set;} - - /// - /// Desc:单位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_id {get;set;} - - /// - /// Desc:单位代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? unit_code {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 解绑记录ID + /// + public string carryunbind_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string? barcode { get; set; } + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int? codeqty { get; set; } + + /// + /// 行号 + /// + public int? no { get; set; } + + /// + /// 子载具ID + /// + public string? membercarry_id { get; set; } + + /// + /// 子载具编号 + /// + public string? membercarry_code { get; set; } + + /// + /// 单位ID + /// + public string? unit_id { get; set; } + + /// + /// 单位代码 + /// + public string? unit_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindH.cs index 01982b52..58865bce 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindH.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具解绑记录主表 +/// +[SugarTable("wms_carryunbind_h")] +public partial class WmsCarryunbindH : BaseEntity { - /// - ///载具解绑记录主表 - /// - [SugarTable("wms_carryunbind_h")] - public partial class WmsCarryunbindH + public WmsCarryunbindH() { - public WmsCarryunbindH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:载具名称 - /// Default: - /// Nullable:False - /// - public string carry_name {get;set;} = string.Empty; - - /// - /// Desc:dataType - /// Default: - /// Nullable:False - /// - public int biz_type {get;set;} - - /// - /// Desc:载具分类ID - /// Default: - /// Nullable:False - /// - public string carrystd_id {get;set;} = string.Empty; - - /// - /// Desc:子载具ID - /// Default: - /// Nullable:False - /// - public string membercarry_id {get;set;} = string.Empty; - - /// - /// Desc:子载具编号 - /// Default: - /// Nullable:False - /// - public string membercarry_code {get;set;} = string.Empty; - - /// - /// Desc:位置 - /// Default: - /// Nullable:False - /// - public int loc {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:设备ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? ept_id {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 载具名称 + /// + public string carry_name { get; set; } = string.Empty; + + /// + /// dataType + /// + public int biz_type { get; set; } + + /// + /// 载具分类ID + /// + public string carrystd_id { get; set; } = string.Empty; + + /// + /// 子载具ID + /// + public string membercarry_id { get; set; } = string.Empty; + + /// + /// 子载具编号 + /// + public string membercarry_code { get; set; } = string.Empty; + + /// + /// 位置 + /// + public int loc { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 设备ID + /// + public string? ept_id { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeD.cs index 781e23f3..84ed84fb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeD.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套搭配方案明细表 +/// +[SugarTable("wms_collocation_scheme_d")] +public partial class WmsCollocationSchemeD : BaseEntity { - /// - ///齐套搭配方案明细表 - /// - [SugarTable("wms_collocation_scheme_d")] - public partial class WmsCollocationSchemeD + public WmsCollocationSchemeD() { - public WmsCollocationSchemeD(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:搭配方案ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:物料ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物料代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:载具规格ID - /// Default: - /// Nullable:False - /// - public string carrystd_id {get;set;} = string.Empty; - - /// - /// Desc:数量(件数) - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:箱数 - /// Default: - /// Nullable:False - /// - public int box {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 搭配方案ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 物料ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物料代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 载具规格ID + /// + public string carrystd_id { get; set; } = string.Empty; + + /// + /// 数量(件数) + /// + public decimal qty { get; set; } + + /// + /// 箱数 + /// + public int box { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + + /// + /// 行号 + /// + public int bill_line { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs index d6acf13a..0e729023 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCollocationSchemeH.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套搭配方案主表 +/// +[SugarTable("wms_collocation_scheme_h")] +public partial class WmsCollocationSchemeH : BaseEntity { - /// - ///齐套搭配方案主表 - /// - [SugarTable("wms_collocation_scheme_h")] - public partial class WmsCollocationSchemeH + public WmsCollocationSchemeH() { - public WmsCollocationSchemeH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:搭配方案编号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:搭配方案名称 - /// Default: - /// Nullable:False - /// - public string bill_name {get;set;} = string.Empty; - - /// - /// Desc:顺序号 - /// Default: - /// Nullable:False - /// - public int order {get;set;} - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:产品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:产品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:配送次数 - /// Default: - /// Nullable:False - /// - public int count {get;set;} - - /// - /// Desc:最低库存 - /// Default: - /// Nullable:False - /// - public int minimum {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 搭配方案编号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 搭配方案名称 + /// + public string bill_name { get; set; } = string.Empty; + + /// + /// 顺序号 + /// + public int seq { get; set; } + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 产品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 产品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 配送次数 + /// + public int count { get; set; } + + /// + /// 最低库存 + /// + public int minimum { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + + /// + /// 库位ID + /// + public string? location_id { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDelivery.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDelivery.cs index 8655d965..446a589f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDelivery.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDelivery.cs @@ -1,182 +1,127 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 配送申请表 +/// +[SugarTable("wms_delivery")] +public partial class WmsDelivery : BaseEntity { - /// - ///配送申请表 - /// - [SugarTable("wms_delivery")] - public partial class WmsDelivery + public WmsDelivery() { - public WmsDelivery(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:起始库位ID - /// Default: - /// Nullable:False - /// - public string startlocation_id {get;set;} = string.Empty; - - /// - /// Desc:起始楼层 - /// Default: - /// Nullable:False - /// - public string start_floor {get;set;} = string.Empty; - - /// - /// Desc:目标库位ID - /// Default: - /// Nullable:False - /// - public string endlocation_id {get;set;} = string.Empty; - - /// - /// Desc:目标楼层 - /// Default: - /// Nullable:False - /// - public string end_floor {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:配送类型 - /// Default: - /// Nullable:False - /// - public string dis_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 起始库位ID + /// + public string startlocation_id { get; set; } = string.Empty; + + /// + /// 起始楼层 + /// + public string start_floor { get; set; } = string.Empty; + + /// + /// 目标库位ID + /// + public string endlocation_id { get; set; } = string.Empty; + + /// + /// 目标楼层 + /// + public string end_floor { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 配送类型 + /// + public string dis_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskCode.cs index 68787f4a..b234e444 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 任务执行条码明细表 +/// +[SugarTable("wms_distask_code")] +public partial class WmsDistaskCode : BaseEntity { - /// - ///任务执行条码明细表 - /// - [SugarTable("wms_distask_code")] - public partial class WmsDistaskCode + public WmsDistaskCode() { - public WmsDistaskCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:任务单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - - /// - /// Desc:子载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_id {get;set;} - - /// - /// Desc:子载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 任务单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + + /// + /// 子载具ID + /// + public string? membercarry_id { get; set; } + + /// + /// 子载具编号 + /// + public string? membercarry_code { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs index 8a0600b4..7b211f7f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs @@ -1,280 +1,197 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 任务执行主表 +/// +[SugarTable("wms_distask_h")] +public partial class WmsDistaskH : BaseEntity { - /// - ///任务执行主表 - /// - [SugarTable("wms_distask_h")] - public partial class WmsDistaskH + public WmsDistaskH() { - public WmsDistaskH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:起始库位ID - /// Default: - /// Nullable:False - /// - public string startlocation_id {get;set;} = string.Empty; - - /// - /// Desc:起始楼层 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? start_floor {get;set;} - - /// - /// Desc:目标库位ID - /// Default: - /// Nullable:False - /// - public string endlocation_id {get;set;} = string.Empty; - - /// - /// Desc:目标楼层 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? end_floor {get;set;} - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型 - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:任务类型 - /// Default: - /// Nullable:False - /// - public string task_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:路径管理区ID - /// Default: - /// Nullable:False - /// - public string area_id {get;set;} = string.Empty; - - /// - /// Desc:路径管理区编号 - /// Default: - /// Nullable:False - /// - public string area_code {get;set;} = string.Empty; - - /// - /// Desc:设备ID - /// Default: - /// Nullable:False - /// - public string device_id {get;set;} = string.Empty; - - /// - /// Desc:预任务申请ID - /// Default: - /// Nullable:False - /// - public string pertask_id {get;set;} = string.Empty; - - /// - /// Desc:预任务申请单号 - /// Default: - /// Nullable:False - /// - public string pertask_code {get;set;} = string.Empty; - - /// - /// Desc:是否签收 - /// Default: - /// Nullable:False - /// - public int is_sign {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:任务组编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? groups {get;set;} - - /// - /// Desc:是否任务链 - /// Default: - /// Nullable:False - /// - public int is_chain {get;set;} - - /// - /// Desc:属性 - /// Default: - /// Nullable:False - /// - public string chain_type {get;set;} = string.Empty; - - /// - /// Desc:预计开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_start_date {get;set;} - - /// - /// Desc:预计结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? plan_end_date {get;set;} - - /// - /// Desc:实际开始时间 - /// Default: - /// Nullable:True - /// - public DateTime? act_start_date {get;set;} - - /// - /// Desc:实际结束时间 - /// Default: - /// Nullable:True - /// - public DateTime? act_end_date {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:协议内容 - /// Default: - /// Nullable:False - /// - public string agreement {get;set;} = string.Empty; - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 起始库位ID + /// + public string startlocation_id { get; set; } = string.Empty; + + /// + /// 起始楼层 + /// + public string? start_floor { get; set; } + + /// + /// 目标库位ID + /// + public string endlocation_id { get; set; } = string.Empty; + + /// + /// 目标楼层 + /// + public string? end_floor { get; set; } + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型 + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 任务类型 + /// + public string task_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 路径管理区ID + /// + public string area_id { get; set; } = string.Empty; + + /// + /// 路径管理区编号 + /// + public string area_code { get; set; } = string.Empty; + + /// + /// 设备ID + /// + public string device_id { get; set; } = string.Empty; + + /// + /// 预任务申请ID + /// + public string pertask_id { get; set; } = string.Empty; + + /// + /// 预任务申请单号 + /// + public string pertask_code { get; set; } = string.Empty; + + /// + /// 是否签收 + /// + public int is_sign { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 任务组编号 + /// + public string? groups { get; set; } + + /// + /// 是否任务链 + /// + public int is_chain { get; set; } + + /// + /// 属性 + /// + public string chain_type { get; set; } = string.Empty; + + /// + /// 预计开始时间 + /// + public DateTime? plan_start_date { get; set; } + + /// + /// 预计结束时间 + /// + public DateTime? plan_end_date { get; set; } + + /// + /// 实际开始时间 + /// + public DateTime? act_start_date { get; set; } + + /// + /// 实际结束时间 + /// + public DateTime? act_end_date { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 协议内容 + /// + public string agreement { get; set; } = string.Empty; + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyInstock.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyInstock.cs index e43fc287..09e77eff 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyInstock.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyInstock.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 空载具入库 +/// +[SugarTable("wms_empty_instock")] +public partial class WmsEmptyInstock : BaseEntity { - /// - ///空载具入库 - /// - [SugarTable("wms_empty_instock")] - public partial class WmsEmptyInstock + public WmsEmptyInstock() { - public WmsEmptyInstock(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:入库仓库 - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + + /// + /// 入库仓库 + /// + public string warehouse_id { get; set; } = string.Empty; + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs index 8526457e..16246d7b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 空载具出库子表 +/// +[SugarTable("wms_empty_outstock_d")] +public partial class WmsEmptyOutstockD : BaseEntity { - /// - ///空载具出库子表 - /// - [SugarTable("wms_empty_outstock_d")] - public partial class WmsEmptyOutstockD + public WmsEmptyOutstockD() { - public WmsEmptyOutstockD(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:行号 - /// Default: - /// Nullable:True - /// - public int? no {get;set;} - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:空载具出库ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 行号 + /// + public int? no { get; set; } + + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 空载具出库ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockH.cs index fab8d77d..5f311737 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockH.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 空载具出库主表 +/// +[SugarTable("wms_empty_outstock_h")] +public partial class WmsEmptyOutstockH : BaseEntity { - /// - ///空载具出库主表 - /// - [SugarTable("wms_empty_outstock_h")] - public partial class WmsEmptyOutstockH + public WmsEmptyOutstockH() { - public WmsEmptyOutstockH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:载具规格 - /// Default: - /// Nullable:False - /// - public string carrystd_id {get;set;} = string.Empty; - - /// - /// Desc:数量 - /// Default: - /// Nullable:False - /// - public int qty {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 载具规格 + /// + public string carrystd_id { get; set; } = string.Empty; + + /// + /// 数量 + /// + public int qty { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedbox.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedbox.cs index 29daeb6c..d4428231 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedbox.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedbox.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 投料箱 +/// +[SugarTable("wms_feedbox")] +public partial class WmsFeedbox : BaseEntity { - /// - ///投料箱 - /// - [SugarTable("wms_feedbox")] - public partial class WmsFeedbox + public WmsFeedbox() { - public WmsFeedbox(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:投料箱编号 - /// Default: - /// Nullable:False - /// - public string feedbox_code {get;set;} = string.Empty; - - /// - /// Desc:投料箱名称 - /// Default: - /// Nullable:False - /// - public string feedbox_name {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:理论数量 - /// Default: - /// Nullable:False - /// - public int qty {get;set;} - - /// - /// Desc:当前批次 - /// Default: - /// Nullable:False - /// - public string batch {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 投料箱编号 + /// + public string feedbox_code { get; set; } = string.Empty; + + /// + /// 投料箱名称 + /// + public string feedbox_name { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 理论数量 + /// + public int qty { get; set; } + + /// + /// 当前批次 + /// + public string batch { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordCode.cs index cb4111e3..e04c6909 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordCode.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 投料记录条码明细表 +/// +[SugarTable("wms_feedingrecord_code")] +public partial class WmsFeedingrecordCode : BaseEntity { - /// - ///投料记录条码明细表 - /// - [SugarTable("wms_feedingrecord_code")] - public partial class WmsFeedingrecordCode + public WmsFeedingrecordCode() { - public WmsFeedingrecordCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:投料记录ID - /// Default: - /// Nullable:False - /// - public string record_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 投料记录ID + /// + public string record_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordH.cs index 13851147..dda948f2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsFeedingrecordH.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 投料记录主表 +/// +[SugarTable("wms_feedingrecord_h")] +public partial class WmsFeedingrecordH : BaseEntity { - /// - ///投料记录主表 - /// - [SugarTable("wms_feedingrecord_h")] - public partial class WmsFeedingrecordH + public WmsFeedingrecordH() { - public WmsFeedingrecordH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:投料记录单号 - /// Default: - /// Nullable:False - /// - public string record_code {get;set;} = string.Empty; - - /// - /// Desc:投料箱编号 - /// Default: - /// Nullable:False - /// - public string feedbox_code {get;set;} = string.Empty; - - /// - /// Desc:投料箱名称 - /// Default: - /// Nullable:False - /// - public string feedbox_name {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_id {get;set;} - - /// - /// Desc:载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_code {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 投料记录单号 + /// + public string record_code { get; set; } = string.Empty; + + /// + /// 投料箱编号 + /// + public string feedbox_code { get; set; } = string.Empty; + + /// + /// 投料箱名称 + /// + public string feedbox_name { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string? carry_id { get; set; } + + /// + /// 载具编号 + /// + public string? carry_code { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs index 5c959a19..db49acda 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs @@ -1,147 +1,102 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 出入口操作条码明细表 +/// +[SugarTable("wms_handle_code")] +public partial class WmsHandleCode : BaseEntity { - /// - ///出入口操作条码明细表 - /// - [SugarTable("wms_handle_code")] - public partial class WmsHandleCode + public WmsHandleCode() { - public WmsHandleCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:操作单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 操作单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleH.cs index 59e73db2..0e957daf 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleH.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 出入口操作主表 +/// +[SugarTable("wms_handle_h")] +public partial class WmsHandleH : BaseEntity { - /// - ///出入口操作主表 - /// - [SugarTable("wms_handle_h")] - public partial class WmsHandleH + public WmsHandleH() { - public WmsHandleH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:起始库位ID - /// Default: - /// Nullable:False - /// - public string startlocation_id {get;set;} = string.Empty; - - /// - /// Desc:目标库位ID - /// Default: - /// Nullable:False - /// - public string endlocation_id {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string tenant_id { get; set; } = string.Empty; + + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 起始库位ID + /// + public string startlocation_id { get; set; } = string.Empty; + + /// + /// 目标库位ID + /// + public string endlocation_id { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs index 30956947..c80e2eba 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs @@ -1,217 +1,152 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 入库申请条码表 +/// +[SugarTable("wms_instock_code")] +public partial class WmsInstockCode : BaseEntity { - /// - ///入库申请条码表 - /// - [SugarTable("wms_instock_code")] - public partial class WmsInstockCode + public WmsInstockCode() { - public WmsInstockCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:入库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:入库单明细ID - /// Default: - /// Nullable:False - /// - public string bill_d_id {get;set;} = string.Empty; - - /// - /// Desc:入库单明细行号 - /// Default: - /// Nullable:False - /// - public int bill_d_line {get;set;} - - /// - /// Desc:明细状态 - /// Default: - /// Nullable:False - /// - public int line_status {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int barcode_qty {get;set;} - - /// - /// Desc:是否锁定 - /// Default: - /// Nullable:False - /// - public int is_lock {get;set;} - - /// - /// Desc:是否结束 - /// Default: - /// Nullable:False - /// - public int is_end {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:源单单据类型 - /// Default: - /// Nullable:True - /// - public int? source_type {get;set;} - - /// - /// Desc:来源单据行号 - /// Default: - /// Nullable:True - /// - public int? source_line {get;set;} - - /// - /// Desc:来源单据明细ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_detail_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 入库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 入库单明细ID + /// + public string bill_d_id { get; set; } = string.Empty; + + /// + /// 入库单明细行号 + /// + public int bill_d_line { get; set; } + + /// + /// 明细状态 + /// + public int line_status { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int barcode_qty { get; set; } + + /// + /// 是否锁定 + /// + public int is_lock { get; set; } + + /// + /// 是否结束 + /// + public int is_end { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.cs index 632ddcf3..09dd88fc 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.cs @@ -1,266 +1,187 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 入库申请明细表 +/// +[SugarTable("wms_instock_d")] +public partial class WmsInstockD : BaseEntity { - /// - ///入库申请明细表 - /// - [SugarTable("wms_instock_d")] - public partial class WmsInstockD + public WmsInstockD() { - public WmsInstockD(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:入库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:执行状态 - /// Default: - /// Nullable:False - /// - public int line_status {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:入库需求数量 - /// Default: - /// Nullable:False - /// - public int pr_qty {get;set;} - - /// - /// Desc:实际入库数量 - /// Default: - /// Nullable:False - /// - public int qty {get;set;} - - /// - /// Desc:原因 - /// Default: - /// Nullable:False - /// - public string reason {get;set;} = string.Empty; - - /// - /// Desc:入库仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:不含税单价 - /// Default: - /// Nullable:True - /// - public decimal? price {get;set;} - - /// - /// Desc:含税单价 - /// Default: - /// Nullable:True - /// - public decimal? tax_price {get;set;} - - /// - /// Desc:不含税金额 - /// Default: - /// Nullable:True - /// - public decimal? amount {get;set;} - - /// - /// Desc:含税金额 - /// Default: - /// Nullable:True - /// - public decimal? all_amount {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:源单单据类型 - /// Default: - /// Nullable:True - /// - public int? source_type {get;set;} - - /// - /// Desc:来源单据行号 - /// Default: - /// Nullable:True - /// - public int? source_line {get;set;} - - /// - /// Desc:来源单据明细ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_detail_id {get;set;} - - /// - /// Desc:生产工单号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:生产工单行号 - /// Default: - /// Nullable:True - /// - public int? mo_line {get;set;} - - /// - /// Desc:生产工单BOM明细Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_bom_detail_id {get;set;} - - /// - /// Desc:已打印数量 - /// Default: - /// Nullable:False - /// - public int print_qty {get;set;} - - /// - /// Desc:扫描数量 - /// Default: - /// Nullable:False - /// - public int scan_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 入库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 执行状态 + /// + public int line_status { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 入库需求数量 + /// + public int pr_qty { get; set; } + + /// + /// 实际入库数量 + /// + public int qty { get; set; } + + /// + /// 原因 + /// + public string reason { get; set; } = string.Empty; + + /// + /// 入库仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 不含税单价 + /// + public decimal? price { get; set; } + + /// + /// 含税单价 + /// + public decimal? tax_price { get; set; } + + /// + /// 不含税金额 + /// + public decimal? amount { get; set; } + + /// + /// 含税金额 + /// + public decimal? all_amount { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 生产工单号 + /// + public string? mo_code { get; set; } + + /// + /// 生产工单行号 + /// + public int? mo_line { get; set; } + + /// + /// 生产工单BOM明细Id + /// + public string? mo_bom_detail_id { get; set; } + + /// + /// 已打印数量 + /// + public int print_qty { get; set; } + + /// + /// 扫描数量 + /// + public int scan_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 批次 + /// + public string? code_batch { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs index debbb4d9..cfb4ebe3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 入库申请主表 +/// +[SugarTable("wms_instock_h")] +public partial class WmsInstockH : BaseEntity { - /// - ///入库申请主表 - /// - [SugarTable("wms_instock_h")] - public partial class WmsInstockH + public WmsInstockH() { - public WmsInstockH(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:入库单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:入库单创建日期 - /// Default: - /// Nullable:False - /// - public DateTime bill_date {get;set;} - - /// - /// Desc:单据类型： - /// Default: - /// Nullable:False - /// - public string bill_type {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:入库仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:供应商ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_id {get;set;} - - /// - /// Desc:供应商代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_code {get;set;} - - /// - /// Desc:供应商名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_name {get;set;} - - /// - /// Desc:生成类型 - /// Default: - /// Nullable:False - /// - public string generate_type {get;set;} = string.Empty; - - /// - /// Desc:同步状态 - /// Default: - /// Nullable:False - /// - public string sync_status {get;set;} = string.Empty; - - /// - /// Desc:打印状态 - /// Default: - /// Nullable:False - /// - public string print_status {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_id {get;set;} - - /// - /// Desc:载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_code {get;set;} - - /// - /// Desc:库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string tenant_id { get; set; } = string.Empty; + + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 入库单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 入库单创建日期 + /// + public DateTime bill_date { get; set; } = DateTime.Now; + + /// + /// 单据类型： + /// + public string bill_type { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 入库仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 供应商ID + /// + public string? supplier_id { get; set; } + + /// + /// 供应商代码 + /// + public string? supplier_code { get; set; } + + /// + /// 供应商名称 + /// + public string? supplier_name { get; set; } + + /// + /// 生成类型 + /// + public string generate_type { get; set; } = string.Empty; + + /// + /// 同步状态 + /// + public string sync_status { get; set; } = string.Empty; + + /// + /// 打印状态 + /// + public string print_status { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 载具ID + /// + public string? carry_id { get; set; } + + /// + /// 载具编号 + /// + public string? carry_code { get; set; } + + /// + /// 库位ID + /// + public string? location_id { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstock.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstock.cs index fe01cdc1..d9ef6375 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstock.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstock.cs @@ -1,203 +1,142 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套入库主表 +/// +[SugarTable("wms_kitting_instock")] +public partial class WmsKittingInstock : BaseEntity { - /// - ///齐套入库主表 - /// - [SugarTable("wms_kitting_instock")] - public partial class WmsKittingInstock + public WmsKittingInstock() { - public WmsKittingInstock(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:齐套搭配方案ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? collocation_scheme_id {get;set;} - - /// - /// Desc:齐套搭配方案编号 - /// Default: - /// Nullable:False - /// - public string collocation_scheme_code {get;set;} = string.Empty; - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单单据类型 - /// Default: - /// Nullable:True - /// - public int? source_type {get;set;} - - /// - /// Desc:来源单据行号 - /// Default: - /// Nullable:True - /// - public int? source_line {get;set;} - - /// - /// Desc:来源单据明细ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_detail_id {get;set;} - - /// - /// Desc:生产工单号 - /// Default: - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:生产工单BOM明细Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_bom_detail_id {get;set;} - - /// - /// Desc:生产工单行号 - /// Default: - /// Nullable:True - /// - public int? mo_line {get;set;} - - /// - /// Desc:顺序号 - /// Default: - /// Nullable:False - /// - public int order {get;set;} - - /// - /// Desc:入库仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 齐套搭配方案ID + /// + public string? collocation_scheme_id { get; set; } + + /// + /// 齐套搭配方案编号 + /// + public string collocation_scheme_code { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 生产工单号 + /// + public string? mo_code { get; set; } + + /// + /// 生产工单BOM明细Id + /// + public string? mo_bom_detail_id { get; set; } + + /// + /// 生产工单行号 + /// + public int? mo_line { get; set; } + + /// + /// 顺序号 + /// + public int seq { get; set; } + + /// + /// 入库仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstockCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstockCode.cs index 59d3f4e8..9f16b7f8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstockCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingInstockCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套入库条码表 +/// +[SugarTable("wms_kitting_instock_code")] +public partial class WmsKittingInstockCode : BaseEntity { - /// - ///齐套入库条码表 - /// - [SugarTable("wms_kitting_instock_code")] - public partial class WmsKittingInstockCode + public WmsKittingInstockCode() { - public WmsKittingInstockCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:入库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:子载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_id {get;set;} - - /// - /// Desc:子载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 入库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 子载具ID + /// + public string? membercarry_id { get; set; } + + /// + /// 子载具编号 + /// + public string? membercarry_code { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutCode.cs index 58005b60..7124f6a4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutCode.cs @@ -1,175 +1,122 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套出库条码表 +/// +[SugarTable("wms_kittingout_code")] +public partial class WmsKittingoutCode : BaseEntity { - /// - ///齐套出库条码表 - /// - [SugarTable("wms_kittingout_code")] - public partial class WmsKittingoutCode + public WmsKittingoutCode() { - public WmsKittingoutCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int barcode_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:子载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_id {get;set;} - - /// - /// Desc:子载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_code {get;set;} - - /// - /// Desc:出库单明细ID - /// Default: - /// Nullable:False - /// - public string bill_d_id {get;set;} = string.Empty; - - /// - /// Desc:出库单明细行号 - /// Default: - /// Nullable:False - /// - public int bill_d_line {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 条码数量 + /// + public int barcode_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 子载具ID + /// + public string? membercarry_id { get; set; } + + /// + /// 子载具编号 + /// + public string? membercarry_code { get; set; } + + /// + /// 出库单明细ID + /// + public string bill_d_id { get; set; } = string.Empty; + + /// + /// 出库单明细行号 + /// + public int bill_d_line { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutD.cs index e445dee2..7a0478e6 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutD.cs @@ -1,168 +1,117 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套出库明细表 +/// +[SugarTable("wms_kittingout_d")] +public partial class WmsKittingoutD : BaseEntity { - /// - ///齐套出库明细表 - /// - [SugarTable("wms_kittingout_d")] - public partial class WmsKittingoutD + public WmsKittingoutD() { - public WmsKittingoutD(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:数量(件数) - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:箱数 - /// Default: - /// Nullable:False - /// - public int box {get;set;} - - /// - /// Desc:实际数量(件数) - /// Default: - /// Nullable:False - /// - public decimal real_qty {get;set;} - - /// - /// Desc:实际箱数 - /// Default: - /// Nullable:False - /// - public int real_box {get;set;} - - /// - /// Desc:发料仓库 - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 数量(件数) + /// + public decimal qty { get; set; } + + /// + /// 箱数 + /// + public int box { get; set; } + + /// + /// 实际数量(件数) + /// + public decimal real_qty { get; set; } + + /// + /// 实际箱数 + /// + public int real_box { get; set; } + + /// + /// 发料仓库 + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutH.cs index 5737a3c7..d09a8a25 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsKittingoutH.cs @@ -1,238 +1,167 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套出库主表 +/// +[SugarTable("wms_kittingout_h")] +public partial class WmsKittingoutH : BaseEntity { - /// - ///齐套出库主表 - /// - [SugarTable("wms_kittingout_h")] - public partial class WmsKittingoutH + public WmsKittingoutH() { - public WmsKittingoutH(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:齐套出库单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:出库单创建日期 - /// Default: - /// Nullable:False - /// - public DateTime bill_date {get;set;} - - /// - /// Desc:单据类型 - /// Default: - /// Nullable:False - /// - public string bill_type {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型 - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:发料仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - - /// - /// Desc:产品ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:产品编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_code {get;set;} - - /// - /// Desc:齐套搭配方案ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? collocation_scheme_id {get;set;} - - /// - /// Desc:齐套搭配方案编号 - /// Default: - /// Nullable:False - /// - public string collocation_scheme_code {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_id {get;set;} - - /// - /// Desc:载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_code {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单单据类型 - /// Default: - /// Nullable:True - /// - public int? source_type {get;set;} - - /// - /// Desc:来源单据行号 - /// Default: - /// Nullable:True - /// - public int? source_line {get;set;} - - /// - /// Desc:来源单据明细ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_detail_id {get;set;} - - /// - /// Desc:生产工单号 - /// Default: - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:生产工单BOM明细Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_bom_detail_id {get;set;} - - /// - /// Desc:生产工单行号 - /// Default: - /// Nullable:True - /// - public int? mo_line {get;set;} - - /// - /// Desc:顺序号 - /// Default: - /// Nullable:False - /// - public int order {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:False - /// - public string modify_id {get;set;} = string.Empty; - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:False - /// - public DateTime modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 齐套出库单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 出库单创建日期 + /// + public DateTime bill_date { get; set; } = DateTime.Now; + + /// + /// 单据类型 + /// + public string bill_type { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型 + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 发料仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string? location_id { get; set; } + + /// + /// 产品ID + /// + public string? material_id { get; set; } + + /// + /// 产品编号 + /// + public string? material_code { get; set; } + + /// + /// 齐套搭配方案ID + /// + public string? collocation_scheme_id { get; set; } + + /// + /// 齐套搭配方案编号 + /// + public string collocation_scheme_code { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string? carry_id { get; set; } + + /// + /// 载具编号 + /// + public string? carry_code { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 生产工单号 + /// + public string? mo_code { get; set; } + + /// + /// 生产工单BOM明细Id + /// + public string? mo_bom_detail_id { get; set; } + + /// + /// 生产工单行号 + /// + public int? mo_line { get; set; } + + /// + /// 顺序号 + /// + public int seq { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string modify_id { get; set; } = string.Empty; + + /// + /// 修改时间 + /// + public DateTime modify_time { get; set; } = DateTime.Now; + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveInstock.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveInstock.cs index a35b1449..8fa6db67 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveInstock.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveInstock.cs @@ -1,133 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具移入 +/// +[SugarTable("wms_move_instock")] +public partial class WmsMoveInstock : BaseEntity { - /// - ///载具移入 - /// - [SugarTable("wms_move_instock")] - public partial class WmsMoveInstock + public WmsMoveInstock() { - public WmsMoveInstock(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - - /// - /// Desc:入库仓库 - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + + /// + /// 入库仓库 + /// + public string warehouse_id { get; set; } = string.Empty; + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveOutstock.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveOutstock.cs index fff84724..31a55052 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveOutstock.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMoveOutstock.cs @@ -1,126 +1,87 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 载具移出 +/// +[SugarTable("wms_move_outstock")] +public partial class WmsMoveOutstock : BaseEntity { - /// - ///载具移出 - /// - [SugarTable("wms_move_outstock")] - public partial class WmsMoveOutstock + public WmsMoveOutstock() { - public WmsMoveOutstock(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bale_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bale_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockCode.cs index 4486723c..bf604ac2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 出库申请条码表 +/// +[SugarTable("wms_outstock_code")] +public partial class WmsOutstockCode : BaseEntity { - /// - ///出库申请条码表 - /// - [SugarTable("wms_outstock_code")] - public partial class WmsOutstockCode + public WmsOutstockCode() { - public WmsOutstockCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:出库单明细ID - /// Default: - /// Nullable:False - /// - public string bill_d_id {get;set;} = string.Empty; - - /// - /// Desc:出库单明细行号 - /// Default: - /// Nullable:False - /// - public int bill_d_line {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int barcode_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 出库单明细ID + /// + public string bill_d_id { get; set; } = string.Empty; + + /// + /// 出库单明细行号 + /// + public int bill_d_line { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 条码数量 + /// + public int barcode_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockD.cs index 83ec6756..ca9a869b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockD.cs @@ -1,280 +1,197 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 出库申请明细表 +/// +[SugarTable("wms_outstock_d")] +public partial class WmsOutstockD : BaseEntity { - /// - ///出库申请明细表 - /// - [SugarTable("wms_outstock_d")] - public partial class WmsOutstockD + public WmsOutstockD() { - public WmsOutstockD(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:明细状态 - /// Default: - /// Nullable:False - /// - public int line_status {get;set;} - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:出库需求数量 - /// Default: - /// Nullable:False - /// - public decimal pr_qty {get;set;} - - /// - /// Desc:实际出库数量 - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:要求出库日期（销售出库为交期） - /// Default: - /// Nullable:False - /// - public DateTime delivery_date {get;set;} - - /// - /// Desc:发料仓库 - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:不含税单价 - /// Default: - /// Nullable:True - /// - public decimal? price {get;set;} - - /// - /// Desc:含税单价 - /// Default: - /// Nullable:True - /// - public decimal? tax_price {get;set;} - - /// - /// Desc:不含税金额 - /// Default: - /// Nullable:True - /// - public decimal? amount {get;set;} - - /// - /// Desc:含税金额 - /// Default: - /// Nullable:True - /// - public decimal? all_amount {get;set;} - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单单据类型 - /// Default: - /// Nullable:True - /// - public int? source_type {get;set;} - - /// - /// Desc:来源单据行号 - /// Default: - /// Nullable:True - /// - public int? source_line {get;set;} - - /// - /// Desc:来源单据明细ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_detail_id {get;set;} - - /// - /// Desc:生产工单号 - /// Default: - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:生产工单BOM明细Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_bom_detail_id {get;set;} - - /// - /// Desc:生产工单行号 - /// Default: - /// Nullable:True - /// - public int? mo_line {get;set;} - - /// - /// Desc:打印数量 - /// Default: - /// Nullable:False - /// - public decimal print_qty {get;set;} - - /// - /// Desc:扫描数量 - /// Default: - /// Nullable:False - /// - public decimal scan_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_id {get;set;} - - /// - /// Desc:载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? carry_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 明细状态 + /// + public int line_status { get; set; } + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 出库需求数量 + /// + public decimal pr_qty { get; set; } + + /// + /// 实际出库数量 + /// + public decimal qty { get; set; } + + /// + /// 要求出库日期（销售出库为交期） + /// + public DateTime delivery_date { get; set; } = DateTime.Now; + + /// + /// 发料仓库 + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 不含税单价 + /// + public decimal? price { get; set; } + + /// + /// 含税单价 + /// + public decimal? tax_price { get; set; } + + /// + /// 不含税金额 + /// + public decimal? amount { get; set; } + + /// + /// 含税金额 + /// + public decimal? all_amount { get; set; } + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 生产工单号 + /// + public string? mo_code { get; set; } + + /// + /// 生产工单BOM明细Id + /// + public string? mo_bom_detail_id { get; set; } + + /// + /// 生产工单行号 + /// + public int? mo_line { get; set; } + + /// + /// 打印数量 + /// + public decimal print_qty { get; set; } + + /// + /// 扫描数量 + /// + public decimal scan_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 载具ID + /// + public string? carry_id { get; set; } + + /// + /// 载具编号 + /// + public string? carry_code { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockH.cs index bc4156f2..99c50715 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutstockH.cs @@ -1,217 +1,152 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 出库申请主表 +/// +[SugarTable("wms_outstock_h")] +public partial class WmsOutstockH : BaseEntity { - /// - ///出库申请主表 - /// - [SugarTable("wms_outstock_h")] - public partial class WmsOutstockH + public WmsOutstockH() { - public WmsOutstockH(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:出库单创建日期 - /// Default: - /// Nullable:False - /// - public DateTime bill_date {get;set;} - - /// - /// Desc:单据类型 - /// Default: - /// Nullable:False - /// - public string bill_type {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型 - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:发料仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default: - /// Nullable:False - /// - public string location_id {get;set;} = string.Empty; - - /// - /// Desc:生成类型 - /// Default: - /// Nullable:False - /// - public string generate_type {get;set;} = string.Empty; - - /// - /// Desc:同步状态 - /// Default: - /// Nullable:False - /// - public string sync_status {get;set;} = string.Empty; - - /// - /// Desc:出库部门ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? dept_id {get;set;} - - /// - /// Desc:出库原因 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? reason {get;set;} - - /// - /// Desc:供应商ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_id {get;set;} - - /// - /// Desc:供应商代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_code {get;set;} - - /// - /// Desc:供应商名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? supplier_name {get;set;} - - /// - /// Desc:客户id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? customer_id {get;set;} - - /// - /// Desc:客户编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? customer_code {get;set;} - - /// - /// Desc:客户名称 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? customer_name {get;set;} - - /// - /// Desc:使用部门ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? use_dept_id {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:False - /// - public string modify_id {get;set;} = string.Empty; - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:False - /// - public DateTime modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string tenant_id { get; set; } = string.Empty; + + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 出库单创建日期 + /// + public DateTime bill_date { get; set; } = DateTime.Now; + + /// + /// 单据类型 + /// + public string bill_type { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型 + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 发料仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string location_id { get; set; } = string.Empty; + + /// + /// 生成类型 + /// + public string generate_type { get; set; } = string.Empty; + + /// + /// 同步状态 + /// + public string sync_status { get; set; } = string.Empty; + + /// + /// 出库部门ID + /// + public string? dept_id { get; set; } + + /// + /// 出库原因 + /// + public string? reason { get; set; } + + /// + /// 供应商ID + /// + public string? supplier_id { get; set; } + + /// + /// 供应商代码 + /// + public string? supplier_code { get; set; } + + /// + /// 供应商名称 + /// + public string? supplier_name { get; set; } + + /// + /// 客户id + /// + public string? customer_id { get; set; } + + /// + /// 客户编号 + /// + public string? customer_code { get; set; } + + /// + /// 客户名称 + /// + public string? customer_name { get; set; } + + /// + /// 使用部门ID + /// + public string? use_dept_id { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string modify_id { get; set; } = string.Empty; + + /// + /// 修改时间 + /// + public DateTime modify_time { get; set; } = DateTime.Now; + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointD.cs index b2ad5ccd..3e03152e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointD.cs @@ -1,105 +1,72 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 点位管理明细表 +/// +[SugarTable("wms_point_d")] +public partial class WmsPointD : BaseEntity { - /// - ///点位管理明细表 - /// - [SugarTable("wms_point_d")] - public partial class WmsPointD + public WmsPointD() { - public WmsPointD(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:点位ID - /// Default: - /// Nullable:False - /// - public string point_id {get;set;} = string.Empty; - - /// - /// Desc:动作属性 - /// Default: - /// Nullable:False - /// - public string action_type {get;set;} = string.Empty; - - /// - /// Desc:动作时间 - /// Default: - /// Nullable:False - /// - public decimal action_time {get;set;} - - /// - /// Desc:目标点位ID - /// Default: - /// Nullable:False - /// - public string endpoint_id {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 点位ID + /// + public string point_id { get; set; } = string.Empty; + + /// + /// 动作属性 + /// + public string action_type { get; set; } = string.Empty; + + /// + /// 动作时间 + /// + public decimal action_time { get; set; } + + /// + /// 目标点位ID + /// + public string endpoint_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointH.cs index a377a366..01dcbecc 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPointH.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 点位管理主表 +/// +[SugarTable("wms_point_h")] +public partial class WmsPointH : BaseEntity { - /// - ///点位管理主表 - /// - [SugarTable("wms_point_h")] - public partial class WmsPointH + public WmsPointH() { - public WmsPointH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:点位代码 - /// Default: - /// Nullable:False - /// - public string point_code {get;set;} = string.Empty; - - /// - /// Desc:点位名称 - /// Default: - /// Nullable:False - /// - public string point_name {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - - /// - /// Desc:库位编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_code {get;set;} - - /// - /// Desc:路径管理区ID - /// Default: - /// Nullable:False - /// - public string area_id {get;set;} = string.Empty; - - /// - /// Desc:路径管理区编号 - /// Default: - /// Nullable:False - /// - public string area_code {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:是否锁定 - /// Default: - /// Nullable:False - /// - public int is_lock {get;set;} - - /// - /// Desc:点位位置X - /// Default: - /// Nullable:False - /// - public decimal point_x {get;set;} - - /// - /// Desc:点位位置Y - /// Default: - /// Nullable:False - /// - public decimal point_y {get;set;} - - /// - /// Desc:点位位置Z - /// Default: - /// Nullable:False - /// - public decimal point_z {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 点位代码 + /// + public string point_code { get; set; } = string.Empty; + + /// + /// 点位名称 + /// + public string point_name { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string? location_id { get; set; } + + /// + /// 库位编号 + /// + public string? location_code { get; set; } + + /// + /// 路径管理区ID + /// + public string area_id { get; set; } = string.Empty; + + /// + /// 路径管理区编号 + /// + public string area_code { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 是否锁定 + /// + public int is_lock { get; set; } + + /// + /// 点位位置X + /// + public decimal point_x { get; set; } + + /// + /// 点位位置Y + /// + public decimal point_y { get; set; } + + /// + /// 点位位置Z + /// + public decimal point_z { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs index 2c2b9d7f..14e0ad70 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 预任务申请条码明细表 +/// +[SugarTable("wms_pretask_code")] +public partial class WmsPretaskCode : BaseEntity { - /// - ///预任务申请条码明细表 - /// - [SugarTable("wms_pretask_code")] - public partial class WmsPretaskCode + public WmsPretaskCode() { - public WmsPretaskCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:预任务单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int codeqty {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public DateTime time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int no {get;set;} - - /// - /// Desc:子载具ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_id {get;set;} - - /// - /// Desc:子载具编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? membercarry_code {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 预任务单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int codeqty { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime time_stamp { get; set; } = DateTime.Now; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 行号 + /// + public int no { get; set; } + + /// + /// 子载具ID + /// + public string? membercarry_id { get; set; } + + /// + /// 子载具编号 + /// + public string? membercarry_code { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs index 6644a279..6a45796b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs @@ -1,196 +1,137 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 预任务申请主表 +/// +[SugarTable("wms_pretask_h")] +public partial class WmsPretaskH : BaseEntity { - /// - ///预任务申请主表 - /// - [SugarTable("wms_pretask_h")] - public partial class WmsPretaskH + public WmsPretaskH() { - public WmsPretaskH(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:起始库位ID - /// Default: - /// Nullable:False - /// - public string startlocation_id {get;set;} = string.Empty; - - /// - /// Desc:起始楼层 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? start_floor {get;set;} - - /// - /// Desc:目标库位ID - /// Default: - /// Nullable:False - /// - public string endlocation_id {get;set;} = string.Empty; - - /// - /// Desc:目标楼层 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? end_floor {get;set;} - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型 - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:任务类型 - /// Default: - /// Nullable:False - /// - public string task_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:路径管理区ID - /// Default: - /// Nullable:False - /// - public string area_id {get;set;} = string.Empty; - - /// - /// Desc:路径管理区编号 - /// Default: - /// Nullable:False - /// - public string area_code {get;set;} = string.Empty; - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_code {get;set;} - - /// - /// Desc:需求单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_id {get;set;} - - /// - /// Desc:需求单据代码 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? require_code {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 起始库位ID + /// + public string startlocation_id { get; set; } = string.Empty; + + /// + /// 起始楼层 + /// + public string? start_floor { get; set; } + + /// + /// 目标库位ID + /// + public string endlocation_id { get; set; } = string.Empty; + + /// + /// 目标楼层 + /// + public string? end_floor { get; set; } + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型 + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 任务类型 + /// + public string task_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 路径管理区ID + /// + public string area_id { get; set; } = string.Empty; + + /// + /// 路径管理区编号 + /// + public string area_code { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRoad.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRoad.cs index fc7620e0..23d0a294 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRoad.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRoad.cs @@ -1,126 +1,92 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 路段管理表 +/// +[SugarTable("wms_road")] +public partial class WmsRoad : BaseEntity { - /// - ///路段管理表 - /// - [SugarTable("wms_road")] - public partial class WmsRoad + public WmsRoad() { - public WmsRoad(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:起始点位ID - /// Default: - /// Nullable:False - /// - public string startpoint_id {get;set;} = string.Empty; - - /// - /// Desc:起始点位编号 - /// Default: - /// Nullable:False - /// - public string startpoint_code {get;set;} = string.Empty; - - /// - /// Desc:终止点位ID - /// Default: - /// Nullable:False - /// - public string endpoint_id {get;set;} = string.Empty; - - /// - /// Desc:终止点位编号 - /// Default: - /// Nullable:False - /// - public string endpoint_code {get;set;} = string.Empty; - - /// - /// Desc:状态 - /// Default: - /// Nullable:False - /// - public int status {get;set;} - - /// - /// Desc:距离 - /// Default: - /// Nullable:False - /// - public int distance {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 起始点位ID + /// + public string startpoint_id { get; set; } = string.Empty; + + /// + /// 起始点位编号 + /// + public string startpoint_code { get; set; } = string.Empty; + + /// + /// 终止点位ID + /// + public string endpoint_id { get; set; } = string.Empty; + + /// + /// 终止点位编号 + /// + public string endpoint_code { get; set; } = string.Empty; + + /// + /// 状态 + /// + public int status { get; set; } + + /// + /// 距离 + /// + public int distance { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + + /// + /// 路段编号 + /// + public string? road_code { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingCode.cs index a637023f..ffad91cd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingCode.cs @@ -1,161 +1,112 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套分拣条码表 +/// +[SugarTable("wms_setsorting_code")] +public partial class WmsSetsortingCode : BaseEntity { - /// - ///齐套分拣条码表 - /// - [SugarTable("wms_setsorting_code")] - public partial class WmsSetsortingCode + public WmsSetsortingCode() { - public WmsSetsortingCode(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:条码编号 - /// Default: - /// Nullable:False - /// - public string barcode {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:条码数量 - /// Default: - /// Nullable:False - /// - public int barcode_qty {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:True - /// - public DateTime? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:出库单明细ID - /// Default: - /// Nullable:False - /// - public string bill_d_id {get;set;} = string.Empty; - - /// - /// Desc:出库单明细行号 - /// Default: - /// Nullable:False - /// - public int bill_d_line {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 条码数量 + /// + public int barcode_qty { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 出库单明细ID + /// + public string bill_d_id { get; set; } = string.Empty; + + /// + /// 出库单明细行号 + /// + public int bill_d_line { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingD.cs index 9f128cb9..03a02914 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingD.cs @@ -1,154 +1,107 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套分拣明细表 +/// +[SugarTable("wms_setsorting_d")] +public partial class WmsSetsortingD : BaseEntity { - /// - ///齐套分拣明细表 - /// - [SugarTable("wms_setsorting_d")] - public partial class WmsSetsortingD + public WmsSetsortingD() { - public WmsSetsortingD(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:出库单ID - /// Default: - /// Nullable:False - /// - public string bill_id {get;set;} = string.Empty; - - /// - /// Desc:行号 - /// Default: - /// Nullable:False - /// - public int bill_line {get;set;} - - /// - /// Desc:物品ID - /// Default: - /// Nullable:False - /// - public string material_id {get;set;} = string.Empty; - - /// - /// Desc:物品代码 - /// Default: - /// Nullable:False - /// - public string material_code {get;set;} = string.Empty; - - /// - /// Desc:单位ID - /// Default: - /// Nullable:False - /// - public string unit_id {get;set;} = string.Empty; - - /// - /// Desc:单位代码 - /// Default: - /// Nullable:False - /// - public string unit_code {get;set;} = string.Empty; - - /// - /// Desc:批次 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? code_batch {get;set;} - - /// - /// Desc:出库需求数量 - /// Default: - /// Nullable:False - /// - public decimal pr_qty {get;set;} - - /// - /// Desc:实际出库数量 - /// Default: - /// Nullable:False - /// - public decimal qty {get;set;} - - /// - /// Desc:发料仓库 - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default: - /// Nullable:False - /// - public string time_stamp {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 出库单ID + /// + public string bill_id { get; set; } = string.Empty; + + /// + /// 行号 + /// + public int bill_line { get; set; } + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 单位代码 + /// + public string unit_code { get; set; } = string.Empty; + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 出库需求数量 + /// + public decimal pr_qty { get; set; } + + /// + /// 实际出库数量 + /// + public decimal qty { get; set; } + + /// + /// 发料仓库 + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string time_stamp { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.cs index 390a80e3..1a665b3a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSetsortingH.cs @@ -1,231 +1,162 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 齐套分拣主表 +/// +[SugarTable("wms_setsorting_h")] +public partial class WmsSetsortingH : BaseEntity { - /// - ///齐套分拣主表 - /// - [SugarTable("wms_setsorting_h")] - public partial class WmsSetsortingH + public WmsSetsortingH() { - public WmsSetsortingH(){ - - - } - /// - /// Desc:Id - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default: - /// Nullable:False - /// - public string tenant_id {get;set;} = string.Empty; - - /// - /// Desc:所属组织ID - /// Default: - /// Nullable:False - /// - public string org_id {get;set;} = string.Empty; - - /// - /// Desc:齐套分拣单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:分拣单创建日期 - /// Default: - /// Nullable:False - /// - public DateTime bill_date {get;set;} - - /// - /// Desc:单据类型 - /// Default: - /// Nullable:False - /// - public string bill_type {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型 - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:发料仓库ID - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:库位ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? location_id {get;set;} - - /// - /// Desc:齐套出库ID - /// Default: - /// Nullable:False - /// - public string kittingout_id {get;set;} = string.Empty; - - /// - /// Desc:产品ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_id {get;set;} - - /// - /// Desc:产品编号 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? material_code {get;set;} - - /// - /// Desc:齐套搭配方案ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? collocation_scheme_id {get;set;} - - /// - /// Desc:齐套搭配方案编号 - /// Default: - /// Nullable:False - /// - public string collocation_scheme_code {get;set;} = string.Empty; - - /// - /// Desc:来源单据ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_id {get;set;} - - /// - /// Desc:来源单单据类型 - /// Default: - /// Nullable:True - /// - public int? source_type {get;set;} - - /// - /// Desc:来源单据行号 - /// Default: - /// Nullable:True - /// - public int? source_line {get;set;} - - /// - /// Desc:来源单据明细ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? source_detail_id {get;set;} - - /// - /// Desc:生产工单号 - /// Default: - /// Nullable:True - /// - public string? mo_code {get;set;} - - /// - /// Desc:生产工单BOM明细Id - /// Default:NULL::character varying - /// Nullable:True - /// - public string? mo_bom_detail_id {get;set;} - - /// - /// Desc:生产工单行号 - /// Default: - /// Nullable:True - /// - public int? mo_line {get;set;} - - /// - /// Desc:顺序号 - /// Default: - /// Nullable:False - /// - public int order {get;set;} - - /// - /// Desc:备注 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? remark {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳 - /// Default:NULL::character varying - /// Nullable:True - /// - public string? time_stamp {get;set;} - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:修改用户 - /// Default: - /// Nullable:False - /// - public string modify_id {get;set;} = string.Empty; - - /// - /// Desc:修改时间 - /// Default: - /// Nullable:False - /// - public DateTime modify_time {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 齐套分拣单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 分拣单创建日期 + /// + public DateTime bill_date { get; set; } = DateTime.Now; + + /// + /// 单据类型 + /// + public string bill_type { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型 + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 发料仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 库位ID + /// + public string? location_id { get; set; } + + /// + /// 齐套出库ID + /// + public string kittingout_id { get; set; } = string.Empty; + + /// + /// 产品ID + /// + public string? material_id { get; set; } + + /// + /// 产品编号 + /// + public string? material_code { get; set; } + + /// + /// 齐套搭配方案ID + /// + public string? collocation_scheme_id { get; set; } + + /// + /// 齐套搭配方案编号 + /// + public string collocation_scheme_code { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 生产工单号 + /// + public string? mo_code { get; set; } + + /// + /// 生产工单BOM明细Id + /// + public string? mo_bom_detail_id { get; set; } + + /// + /// 生产工单行号 + /// + public int? mo_line { get; set; } + + /// + /// 顺序号 + /// + public int order { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public string? time_stamp { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 修改用户 + /// + public string modify_id { get; set; } = string.Empty; + + /// + /// 修改时间 + /// + public DateTime modify_time { get; set; } = DateTime.Now; + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransfer.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransfer.cs index c262dcf5..582b5832 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransfer.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransfer.cs @@ -1,140 +1,97 @@ -using System; -using System.Linq; -using System.Text; +using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.WarehouseMgr.Entities +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 库内转移 +/// +[SugarTable("wms_transfer")] +public partial class WmsTransfer : BaseEntity { - /// - ///库内转移 - /// - [SugarTable("wms_transfer")] - public partial class WmsTransfer + public WmsTransfer() { - public WmsTransfer(){ - - - } - /// - /// Desc:主键 - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey=true)] - public string id {get;set;} = SnowflakeIdHelper.NextId(); - - /// - /// Desc:租户ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? tenant_id {get;set;} - - /// - /// Desc:所属组织ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? org_id {get;set;} - - /// - /// Desc:起始库位ID - /// Default: - /// Nullable:False - /// - public string startlocation_id {get;set;} = string.Empty; - - /// - /// Desc:目标库位ID - /// Default: - /// Nullable:False - /// - public string endlocation_id {get;set;} = string.Empty; - - /// - /// Desc:单号 - /// Default: - /// Nullable:False - /// - public string bill_code {get;set;} = string.Empty; - - /// - /// Desc:单据状态 - /// Default: - /// Nullable:False - /// - public string status {get;set;} = string.Empty; - - /// - /// Desc:业务类型： - /// Default: - /// Nullable:False - /// - public string biz_type {get;set;} = string.Empty; - - /// - /// Desc:载具ID - /// Default: - /// Nullable:False - /// - public string carry_id {get;set;} = string.Empty; - - /// - /// Desc:载具编号 - /// Default: - /// Nullable:False - /// - public string carry_code {get;set;} = string.Empty; - - /// - /// Desc:所属仓库 - /// Default: - /// Nullable:False - /// - public string warehouse_id {get;set;} = string.Empty; - - /// - /// Desc:创建用户 - /// Default: - /// Nullable:False - /// - public string create_id {get;set;} = string.Empty; - - /// - /// Desc:创建时间 - /// Default: - /// Nullable:False - /// - public DateTime create_time {get;set;} - - /// - /// Desc:最后修改人员ID - /// Default:NULL::character varying - /// Nullable:True - /// - public string? modify_id {get;set;} - - /// - /// Desc:最后修改时间 - /// Default: - /// Nullable:True - /// - public DateTime? modify_time {get;set;} - - /// - /// Desc:扩展字段 - /// Default: - /// Nullable:True - /// - public string? extras {get;set;} - - /// - /// Desc:时间戳(用于并发控制) - /// Default: - /// Nullable:True - /// - public DateTime? timestamp {get;set;} - + id = SnowflakeIdHelper.NextId(); } + /// + /// 租户ID + /// + public string? tenant_id { get; set; } + + /// + /// 所属组织ID + /// + public string? org_id { get; set; } + + /// + /// 起始库位ID + /// + public string startlocation_id { get; set; } = string.Empty; + + /// + /// 目标库位ID + /// + public string endlocation_id { get; set; } = string.Empty; + + /// + /// 单号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 单据状态 + /// + public string status { get; set; } = string.Empty; + + /// + /// 业务类型： + /// + public string biz_type { get; set; } = string.Empty; + + /// + /// 载具ID + /// + public string carry_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } = string.Empty; + + /// + /// 所属仓库 + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 创建时间 + /// + public DateTime create_time { get; set; } = DateTime.Now; + + /// + /// 最后修改人员ID + /// + public string? modify_id { get; set; } + + /// + /// 最后修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 时间戳(用于并发控制) + /// + public DateTime? timestamp { get; set; } + } diff --git a/common/Tnb.Common/Contracts/BaseEntity`1.cs b/common/Tnb.Common/Contracts/BaseEntity`1.cs index e7b06393..a252f539 100644 --- a/common/Tnb.Common/Contracts/BaseEntity`1.cs +++ b/common/Tnb.Common/Contracts/BaseEntity`1.cs @@ -3,11 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.Common.Contracts; +namespace JNPF.Common.Contracts; public class BaseEntity : IEntity where TKey : IEquatable { diff --git a/system/Tnb.Systems/System/DataBaseService.cs b/system/Tnb.Systems/System/DataBaseService.cs index a22ede58..62904074 100644 --- a/system/Tnb.Systems/System/DataBaseService.cs +++ b/system/Tnb.Systems/System/DataBaseService.cs @@ -377,10 +377,6 @@ public class DataBaseService : IDynamicApiController, ITransient [HttpPost("{linkId}/gen-code")] public async Task GenerateCode(string linkId, DatabaseTableDataCleanInput input) { - if (input.TableName == "bas_customer") - { - return await GenerateAllEntity(linkId); - } if (input.TableName.IsNullOrWhiteSpace()) { throw new ArgumentNullException(nameof(input.TableName)); @@ -395,51 +391,25 @@ public class DataBaseService : IDynamicApiController, ITransient var link = await _dbLinkService.GetInfo(linkId); sugarClient = _dataBaseManager.ChangeDataBase(link); } - List entities = new(); - Dictionary nsMapper = GetNsMapper(); - foreach (var tbl in sugarClient.DbMaintenance.GetTableInfoList().Where(t => t.Name == input.TableName)) - { - var entityName = string.Join("", tbl.Name.Split('_').Select(a => a.ToPascalCase())); - sugarClient.MappingTables.Add(entityName, tbl.Name); - DbEntityInfo model = new() { tableName = tbl.Name, descrip = tbl.Description, clsName = entityName }; - var key = tbl.Name.Split('_')[0] + "_"; - if (nsMapper.ContainsKey(key)) model.nsName = nsMapper[key]; - foreach (var field in sugarClient.DbMaintenance.GetColumnInfosByTableName(tbl.Name)) - { - DbEntityPropInfo col = field.Adapt(); - col.csType = sugarClient.Ado.DbBind.GetPropertyTypeName(field.DataType); - col.propName = field.DbColumnName; - model.columns.Add(col); - } - var primaryKey = model.columns.FirstOrDefault(a => a.primaryKey); - if (primaryKey != null) - { - model.pkType = primaryKey.csType; - model.pkName = primaryKey.propName; - } - if (model.pkName == "id") model.ignoreCols.Add(model.pkName); - entities.Add(model); - } - var templatePath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Template", "Entity.vue.vm"); - string tContent = File.ReadAllText(templatePath); + List entities = GetDbEntities(sugarClient, input.TableName == "ALL_TABLE" ? null : input.TableName); + var tplContent = File.ReadAllText(Path.Combine(App.WebHostEnvironment.WebRootPath, "Template", "Entity.vue.vm")); + string sResult = string.Empty; foreach (var item in entities) { - var tResult = _viewEngine.RunCompileFromCached(tContent, item, builderAction: builder => + sResult = _viewEngine.RunCompileFromCached(tplContent, item, builderAction: builder => { builder.AddUsing("System.Collections.Generic"); builder.AddAssemblyReferenceByName("System.Collections"); }); var dir = Path.Combine(FileVariable.GenerateCodePath, item.nsName); Directory.CreateDirectory(dir); - File.WriteAllText(Path.Combine(dir, item.clsName + ".cs"), tResult); - - return tResult; + File.WriteAllText(Path.Combine(dir, item.clsName + ".cs"), sResult); } - - var prefix = input.TableName.Split('_')[0]; - var nsName = nsMapper.ContainsKey(prefix) ? nsMapper[prefix] : "Tnb.Entities"; - var dict = GenerateEntityConfig(sugarClient.DbFirst.Where(input.TableName)).ToClassStringList(nsName); - return dict.Count > 0 ? dict.First().Value.Replace("\r\n", "\n") : string.Empty; + return sResult; + //var prefix = input.TableName.Split('_')[0]; + //var nsName = nsMapper.ContainsKey(prefix) ? nsMapper[prefix] : "Tnb.Entities"; + //var dict = GenerateEntityConfig(sugarClient.DbFirst.Where(input.TableName)).ToClassStringList(nsName); + //return dict.Count > 0 ? dict.First().Value.Replace("\r\n", "\n") : string.Empty; } #endregion @@ -617,70 +587,6 @@ public class DataBaseService : IDynamicApiController, ITransient } } - /// - /// 生成所有表的实体类文件 - /// - /// - /// - private async Task GenerateAllEntity(string linkId) - { - ISqlSugarClient sugarClient = _repository.AsSugarClient(); - if (linkId != "0") - { - var link = await _dbLinkService.GetInfo(linkId); - sugarClient = _dataBaseManager.ChangeDataBase(link); - } - foreach (var item in sugarClient.DbMaintenance.GetTableInfoList()) - { - string entityName = string.Join("", item.Name.Split('_').Select(a => a.ToPascalCase())); - sugarClient.MappingTables.Add(entityName, item.Name); - } - Dictionary nsMapper = GetNsMapper(); - - List dirs = new List(); - foreach (string key in nsMapper.Keys) - { - if (key != "eqp_") continue; - var nsName = nsMapper[key]; - var dir = Path.Combine(FileVariable.GenerateCodePath, nsName); - dirs.Add(dir); - if (!Directory.Exists(dir)) - Directory.CreateDirectory(dir); - else - Directory.GetFiles(dir).ToList().ForEach(File.Delete); - GenerateEntityConfig(sugarClient.DbFirst.Where(t => t.StartsWith(key))).CreateClassFile(dir, nsName); - } - string content = string.Empty; - foreach (var dir in dirs) - { - var files = Directory.GetFiles(dir, "*.cs").ToList(); - files.ForEach(f => File.WriteAllText(f, File.ReadAllText(f).Replace("\r\n", "\n"))); - if (files.Count > 0 && string.IsNullOrEmpty(content)) - { - content = File.ReadAllText(files[0]); - } - } - return content; - } - - /// - /// 表前缀与命名空间的映射关系 - /// - /// - private Dictionary GetNsMapper() - { - Dictionary nsMapper = new() - { - {"bas_", "Tnb.BasicData.Entities" }, - {"prd_", "Tnb.ProductionMgr.Entities" }, - {"wms_", "Tnb.WarehouseMgr.Entities" }, - {"eqp_", "Tnb.EquipMgr.Entities" }, - {"tool_", "Tnb.EquipMgr.Entities" }, - {"qc_", "Tnb.QcMgr.Entities" }, - }; - return nsMapper; - } - /// /// 生成实体类配置 /// @@ -713,5 +619,45 @@ public class DataBaseService : IDynamicApiController, ITransient return db; } + private List GetDbEntities(ISqlSugarClient sugar, string? tbName = null) + { + List entities = new(); + Dictionary nsMapper = new() + { + {"bas_", "Tnb.BasicData.Entities" }, + {"prd_", "Tnb.ProductionMgr.Entities" }, + {"wms_", "Tnb.WarehouseMgr.Entities" }, + {"eqp_", "Tnb.EquipMgr.Entities" }, + {"tool_", "Tnb.EquipMgr.Entities" }, + {"qc_", "Tnb.QcMgr.Entities" }, + }; + var allTables = sugar.DbMaintenance.GetTableInfoList().WhereIF(!string.IsNullOrEmpty(tbName), t=>t.Name == tbName); + foreach (var tbl in allTables) + { + var prefix = tbl.Name.Split('_')[0] + "_"; + if (!nsMapper.ContainsKey(prefix)) continue; + + var entityName = string.Join("", tbl.Name.Split('_').Select(a => a.ToPascalCase())); + //sugar.MappingTables.Add(entityName, tbl.Name); + DbEntityInfo model = new() { tableName = tbl.Name, descrip = tbl.Description, clsName = entityName, nsName = nsMapper[prefix] }; + foreach (var field in sugar.DbMaintenance.GetColumnInfosByTableName(tbl.Name)) + { + DbEntityPropInfo col = field.Adapt(); + col.csType = sugar.Ado.DbBind.GetPropertyTypeName(field.DataType); + col.propName = field.DbColumnName; + model.columns.Add(col); + } + var primaryKey = model.columns.FirstOrDefault(a => a.primaryKey); + if (primaryKey != null) + { + model.pkType = primaryKey.csType; + model.pkName = primaryKey.propName; + } + if (model.pkName == "id") model.ignoreCols.Add(model.pkName); + entities.Add(model); + } + return entities; + } + #endregion } \ No newline at end of file