diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 6a644a0..9cc3261 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/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; } - /// - /// ε†™ηŠΆζ€ - /// - 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; } } diff --git a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs index 12c6c1b..b656799 100644 --- a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs +++ b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs @@ -19,9 +19,9 @@ namespace Wood.Service.Datas { - public class SupplierEmployeeDtService : NormalBaseController + public class SupplierEmployeeDtService : NormalBaseController { - public SupplierEmployeeDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) + public SupplierEmployeeDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) { } @@ -37,7 +37,7 @@ namespace Wood.Service.Datas await file.CopyToAsync(memStream); var importer = new ExcelImporter(); - ImportResult impResult = await importer.Import(memStream); + ImportResult impResult = await importer.Import(memStream); if (impResult.HasError) { StringBuilder sb = new StringBuilder(); diff --git a/API/Wood.Service/Datas/SupplierInfoDtService.cs b/API/Wood.Service/Datas/SupplierInfoDtService.cs index 7678632..9f9dcc0 100644 --- a/API/Wood.Service/Datas/SupplierInfoDtService.cs +++ b/API/Wood.Service/Datas/SupplierInfoDtService.cs @@ -19,9 +19,9 @@ namespace Wood.Service.Datas { - public class SupplierInfoDtService : NormalBaseController + public class SupplierInfoDtService : NormalBaseController { - public SupplierInfoDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) + public SupplierInfoDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) { } @@ -37,7 +37,7 @@ namespace Wood.Service.Datas await file.CopyToAsync(memStream); var importer = new ExcelImporter(); - ImportResult impResult = await importer.Import(memStream); + ImportResult impResult = await importer.Import(memStream); if (impResult.HasError) { StringBuilder sb = new StringBuilder(); diff --git a/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs b/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs index 8d498cc..8283525 100644 --- a/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs +++ b/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs @@ -20,9 +20,9 @@ namespace Wood.Service.Datas { - public class SupplierProAttachmentDataDtService : NormalBaseController + public class SupplierProAttachmentDataDtService : NormalBaseController { - public SupplierProAttachmentDataDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) + public SupplierProAttachmentDataDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) { } @@ -38,7 +38,7 @@ namespace Wood.Service.Datas await file.CopyToAsync(memStream); var importer = new ExcelImporter(); - ImportResult impResult = await importer.Import(memStream); + ImportResult impResult = await importer.Import(memStream); if (impResult.HasError) { StringBuilder sb = new StringBuilder(); diff --git a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs index b30084d..6029e51 100644 --- a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs +++ b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs @@ -20,9 +20,9 @@ namespace Wood.Service.Datas { - public class SupplierProProcessEquipmentDtService : NormalBaseController + public class SupplierProProcessEquipmentDtService : NormalBaseController { - public SupplierProProcessEquipmentDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) + public SupplierProProcessEquipmentDtService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) { } @@ -38,7 +38,7 @@ namespace Wood.Service.Datas await file.CopyToAsync(memStream); var importer = new ExcelImporter(); - ImportResult impResult = await importer.Import(memStream); + ImportResult impResult = await importer.Import(memStream); if (impResult.HasError) { StringBuilder sb = new StringBuilder(); diff --git a/Web/.env.development b/Web/.env.development index 2635439..8b26cbf 100644 --- a/Web/.env.development +++ b/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' diff --git a/Web/.env.production b/Web/.env.production index b763518..825588d 100644 --- a/Web/.env.production +++ b/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'