diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index a9f79f1..198a9f9 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using Magicodes.ExporterAndImporter.Core; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -19,38 +20,48 @@ namespace TaskManager.Entity { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [ExporterHeader(IsIgnore = true)] public long UId { get; set; } /// /// API路径 /// + [ExporterHeader(DisplayName = "API路径")] public string Api { get; set; } /// /// 任务周期设置 /// + [ExporterHeader(DisplayName = "任务周期设置")] public string Corn { get; set; } /// /// 模块 /// + [ExporterHeader(IsIgnore = true)] public string Module { get; set; } + /// /// 备注 /// + [ExporterHeader(DisplayName = "备注")] public string Remark { get; set; } /// /// 表名 /// + [ExporterHeader(IsIgnore =true)] public string TableName { get; set; } /// /// 任务名称 /// + [ExporterHeader(DisplayName = "任务名称")] public string TaskName { get; set; } /// /// 全路径 /// + [ExporterHeader(DisplayName = "全路径")] public string Url { get; set; } /// /// 是否自动执行 /// + [ExporterHeader(DisplayName = "是否自动执行")] public bool IsAuto { get; set; } } @@ -86,17 +97,19 @@ namespace TaskManager.Entity { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [ExporterHeader(IsIgnore=true)] public long UId { get; set; } /// /// 写状态 /// public bool WriteState { get; set; } + [ExporterHeader(IsIgnore = true)] public bool ReadState { get; set; } - + [ExporterHeader(IsIgnore = true)] public DateTime CreationTime { get; set; } - + [ExporterHeader(IsIgnore = true)] public string Remark { get; set; } - + [ExporterHeader(IsIgnore = true)] public Guid TaskId { get; set; } } @@ -115,7 +128,7 @@ namespace TaskManager.Entity /// public class TaskSub:BaseEntity { - + [ExporterHeader(DisplayName = "用户名")] /// /// 关联的数据表名称(如:订单表、用户表等,可为空) /// @@ -189,125 +202,7 @@ namespace TaskManager.Entity - /// - /// 来料检验数据 - /// - public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity - { - } - - /// - /// 排产数据 - /// - public class SUPPLIER_PRO_SCHEDULING : BaseEntity - { - } - - /// - /// 供应商基础信息 - /// - public class SUPPLIER_INFO : BaseEntity - { - } - - /// - /// 人员资质信息 - /// - public class SUPPLIER_EMPLOYEE : BaseEntity - { - } - - /// - /// BOM主数据 - /// - public class SUPPLIER_BOM : BaseEntity - { - } - - /// - /// 过程控制项质量数据 - /// - public class SUPPLIER_PRO_CPS : BaseEntity - { - } - - /// - /// 生产过程数据 - /// - public class SUPPLIER_PRO_DATA : BaseEntity - { - } - - /// - /// 产品一次合格率 - /// - public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity - { - } - - /// - /// 工位一次合格率 - /// - //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - //{ - //} - - /// - /// 缺陷业务数据 - /// - public class SUPPLIER_PRO_FLAW : BaseEntity - { - } - - /// - /// 环境业务数据 - /// - public class SUPPLIER_PRO_ENVIRONMENT : BaseEntity - { - } - - /// - /// 设备OEE达成率 - /// - public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE : BaseEntity - { - } - - /// - /// OEE时间明细 - /// - public class SUPPLIER_PRO_OEE_TIME_DETAILS : BaseEntity - { - } - - /// - /// 物料主数据 - /// - public class SUPPLIER_PRO_MATERIAL_DATA : BaseEntity - { - } - - /// - /// 附件类数据 - /// - public class SUPPLIER_PRO_ATTACHMENT_DATA : BaseEntity - { - } - - /// - /// 工艺装备 - /// - public class SUPPLIER_PRO_PROCESS_EQUIPMENT : BaseEntity - { - } - - /// - /// 工艺 - /// - public class SUPPLIER_PRO_PROCESS : BaseEntity - { - } - + /// /// 整车月度生产计划-2 /// diff --git a/API/TaskManager.Entity/TaskManager.Entity.csproj b/API/TaskManager.Entity/TaskManager.Entity.csproj index b11c8a0..90c35bc 100644 --- a/API/TaskManager.Entity/TaskManager.Entity.csproj +++ b/API/TaskManager.Entity/TaskManager.Entity.csproj @@ -7,11 +7,9 @@ + + - - - - diff --git a/API/TaskManager.EntityFramework/Repository/Repository.cs b/API/TaskManager.EntityFramework/Repository/Repository.cs index 3ced26d..c5a9b5f 100644 --- a/API/TaskManager.EntityFramework/Repository/Repository.cs +++ b/API/TaskManager.EntityFramework/Repository/Repository.cs @@ -90,11 +90,6 @@ namespace TaskManager.EntityFramework.Repository return await query.ToPagedListAsync(pagingParams); } - - - - - } public class PagedResult {