加_DT

API/TaskManager.Entity/Entity.cs

@@ -197,22 +197,10 @@ namespace TaskManager.Entity
        
     }
 
-    public class BaseEntity_NoTask
+    public class BaseEntity_NoTask: BaseEntity
     {
-        [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; }
+        [NotMapped] 
+        private new Guid TaskId { get; set; }
     }
 
 

API/Wood.Service/Datas/SupplierEmployeeDtService.cs

@@ -19,9 +19,9 @@ namespace Wood.Service.Datas
 {
     
 
-    public class SupplierEmployeeDtService : NormalBaseController<SUPPLIER_EMPLOYEE>
+    public class SupplierEmployeeDtService : NormalBaseController<SUPPLIER_EMPLOYEE_DT>
     {
-        public SupplierEmployeeDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_EMPLOYEE> repository) : base(context, builder, configuration, repository)
+        public SupplierEmployeeDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_EMPLOYEE_DT> repository) : base(context, builder, configuration, repository)
         {
         }
 
@@ -37,7 +37,7 @@ namespace Wood.Service.Datas
             await file.CopyToAsync(memStream);
 
             var importer = new ExcelImporter();
-            ImportResult<SUPPLIER_EMPLOYEE> impResult = await importer.Import<SUPPLIER_EMPLOYEE>(memStream);
+            ImportResult<SUPPLIER_EMPLOYEE_DT> impResult = await importer.Import<SUPPLIER_EMPLOYEE_DT>(memStream);
             if (impResult.HasError)
             {
                 StringBuilder sb = new StringBuilder();

API/Wood.Service/Datas/SupplierInfoDtService.cs

@@ -19,9 +19,9 @@ namespace Wood.Service.Datas
 {
 
 
-    public class SupplierInfoDtService : NormalBaseController<SUPPLIER_INFO>
+    public class SupplierInfoDtService : NormalBaseController<SUPPLIER_INFO_DT>
     {
-        public SupplierInfoDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_INFO> repository) : base(context, builder, configuration, repository)
+        public SupplierInfoDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_INFO_DT> repository) : base(context, builder, configuration, repository)
         {
         }
 
@@ -37,7 +37,7 @@ namespace Wood.Service.Datas
             await file.CopyToAsync(memStream);
 
             var importer = new ExcelImporter();
-            ImportResult<SUPPLIER_INFO> impResult = await importer.Import<SUPPLIER_INFO>(memStream);
+            ImportResult<SUPPLIER_INFO_DT> impResult = await importer.Import<SUPPLIER_INFO_DT>(memStream);
             if (impResult.HasError)
             {
                 StringBuilder sb = new StringBuilder();

API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs

@@ -20,9 +20,9 @@ namespace Wood.Service.Datas
 {
     
 
-    public class SupplierProAttachmentDataDtService : NormalBaseController<SUPPLIER_PRO_ATTACHMENT_DATA>
+    public class SupplierProAttachmentDataDtService : NormalBaseController<SUPPLIER_PRO_ATTACHMENT_DATA_DT>
     {
-        public SupplierProAttachmentDataDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_PRO_ATTACHMENT_DATA> repository) : base(context, builder, configuration, repository)
+        public SupplierProAttachmentDataDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_PRO_ATTACHMENT_DATA_DT> repository) : base(context, builder, configuration, repository)
         {
         }
 
@@ -38,7 +38,7 @@ namespace Wood.Service.Datas
             await file.CopyToAsync(memStream);
 
             var importer = new ExcelImporter();
-            ImportResult<SUPPLIER_PRO_ATTACHMENT_DATA> impResult = await importer.Import<SUPPLIER_PRO_ATTACHMENT_DATA>(memStream);
+            ImportResult<SUPPLIER_PRO_ATTACHMENT_DATA_DT> impResult = await importer.Import<SUPPLIER_PRO_ATTACHMENT_DATA_DT>(memStream);
             if (impResult.HasError)
             {
                 StringBuilder sb = new StringBuilder();

API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs

@@ -20,9 +20,9 @@ namespace Wood.Service.Datas
 {
     
 
-    public class SupplierProProcessEquipmentDtService : NormalBaseController<SUPPLIER_PRO_PROCESS_EQUIPMENT>
+    public class SupplierProProcessEquipmentDtService : NormalBaseController<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT>
     {
-        public SupplierProProcessEquipmentDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_PRO_PROCESS_EQUIPMENT> repository) : base(context, builder, configuration, repository)
+        public SupplierProProcessEquipmentDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT> repository) : base(context, builder, configuration, repository)
         {
         }
 
@@ -38,7 +38,7 @@ namespace Wood.Service.Datas
             await file.CopyToAsync(memStream);
 
             var importer = new ExcelImporter();
-            ImportResult<SUPPLIER_PRO_PROCESS_EQUIPMENT> impResult = await importer.Import<SUPPLIER_PRO_PROCESS_EQUIPMENT>(memStream);
+            ImportResult<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT> impResult = await importer.Import<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT>(memStream);
             if (impResult.HasError)
             {
                 StringBuilder sb = new StringBuilder();

Web/.env.development

@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # base api
-VITE_API_BASE_URL = 'http://127.0.0.1:7001'
+VITE_API_BASE_URL = 'http://192.168.1.228:7629'

Web/.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VITE_API_BASE_URL = 'http://127.0.0.1:5001'
+VITE_API_BASE_URL = 'http://192.168.1.228:7629'