更新

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; }
         /// <summary>
         /// API路径
         /// </summary>
+        [ExporterHeader(DisplayName = "API路径")]
         public string Api { get; set; }
         /// <summary>
         /// 任务周期设置
         /// </summary>
+        [ExporterHeader(DisplayName = "任务周期设置")]
         public string Corn { get; set; }
         /// <summary>
         /// 模块
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         public string Module { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
+        [ExporterHeader(DisplayName = "备注")]
         public string Remark { get; set; }
         /// <summary>
         /// 表名
         /// </summary>
+        [ExporterHeader(IsIgnore =true)]
         public string TableName { get; set; }
         /// <summary>
         /// 任务名称
         /// </summary>
+        [ExporterHeader(DisplayName = "任务名称")]
         public string TaskName { get; set; }
         /// <summary>
         /// 全路径
         /// </summary>
+        [ExporterHeader(DisplayName = "全路径")]
         public string  Url { get; set; }
         /// <summary>
         /// 是否自动执行
         /// </summary>
+        [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; }
         /// <summary>
         /// 写状态
         /// </summary>
         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
     /// </summary>
     public class TaskSub:BaseEntity
     {
-
+        [ExporterHeader(DisplayName = "用户名")]
         /// <summary>
         /// 关联的数据表名称（如：订单表、用户表等，可为空）
         /// </summary>
@@ -189,125 +202,7 @@ namespace TaskManager.Entity
 
 
 
-    /// <summary>
-    /// 来料检验数据
-    /// </summary>
-    public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 排产数据
-    /// </summary>
-    public class SUPPLIER_PRO_SCHEDULING : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 供应商基础信息
-    /// </summary>
-    public class SUPPLIER_INFO : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 人员资质信息
-    /// </summary>
-    public class SUPPLIER_EMPLOYEE : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// BOM主数据
-    /// </summary>
-    public class SUPPLIER_BOM : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 过程控制项质量数据
-    /// </summary>
-    public class SUPPLIER_PRO_CPS : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 生产过程数据
-    /// </summary>
-    public class SUPPLIER_PRO_DATA : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 产品一次合格率
-    /// </summary>
-    public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 工位一次合格率
-    /// </summary>
-    //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
-    //{
-    //}
-
-    /// <summary>
-    /// 缺陷业务数据
-    /// </summary>
-    public class SUPPLIER_PRO_FLAW : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 环境业务数据
-    /// </summary>
-    public class SUPPLIER_PRO_ENVIRONMENT : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 设备OEE达成率
-    /// </summary>
-    public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// OEE时间明细
-    /// </summary>
-    public class SUPPLIER_PRO_OEE_TIME_DETAILS : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 物料主数据
-    /// </summary>
-    public class SUPPLIER_PRO_MATERIAL_DATA : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 附件类数据
-    /// </summary>
-    public class SUPPLIER_PRO_ATTACHMENT_DATA : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 工艺装备
-    /// </summary>
-    public class SUPPLIER_PRO_PROCESS_EQUIPMENT : BaseEntity
-    {
-    }
-
-    /// <summary>
-    /// 工艺
-    /// </summary>
-    public class SUPPLIER_PRO_PROCESS : BaseEntity
-    {
-    }
-
+   
     /// <summary>
     /// 整车月度生产计划-2
     /// </summary>

API/TaskManager.Entity/TaskManager.Entity.csproj

@@ -7,11 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Magicodes.IE.Core" Version="2.7.5.2" />
+    <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Entitys\10_17\" />
-  </ItemGroup>
-
 </Project>

API/TaskManager.EntityFramework/Repository/Repository.cs

@@ -90,11 +90,6 @@ namespace TaskManager.EntityFramework.Repository
             return await query.ToPagedListAsync(pagingParams);
         }
 
-
-
-
-
-
     }
     public class PagedResult<T>
     {