From 712918121e1aa1717f350e42c1cb847b48d32afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Tue, 2 Dec 2025 16:24:46 +0300 Subject: [PATCH] =?UTF-8?q?Maintenance=20Planning=20Wizard=20g=C3=BCncelle?= =?UTF-8?q?mesi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Seeds/LanguagesData.json | 12 +- .../Seeds/ListFormSeeder_Maintenance.cs | 38 ++-- .../Seeds/MenusData.json | 10 +- .../Seeds/PermissionsData.json | 84 ++++----- .../Enums/TableNameEnum.cs | 6 +- .../TableNameResolver.cs | 6 +- .../Erp.Platform.Domain/Data/SeedConsts.cs | 6 +- .../Maintenance/{Plan.cs => PlanWizard.cs} | 4 +- ...{PlanEmployee.cs => PlanWizardEmployee.cs} | 4 +- ...{PlanMaterial.cs => PlanWizardMaterial.cs} | 6 +- .../Entities/Tenant/Maintenance/Workcenter.cs | 2 +- .../Entities/Tenant/Maintenance/Workorder.cs | 2 +- .../EntityFrameworkCore/PlatformDbContext.cs | 26 +-- ....cs => 20251202131047_Initial.Designer.cs} | 176 +++++++++--------- ...4_Initial.cs => 20251202131047_Initial.cs} | 56 +++--- .../PlatformDbContextModelSnapshot.cs | 174 ++++++++--------- .../Tenants/TenantDataSeeder.cs | 6 +- 17 files changed, 309 insertions(+), 309 deletions(-) rename api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/{Plan.cs => PlanWizard.cs} (87%) rename api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/{PlanEmployee.cs => PlanWizardEmployee.cs} (81%) rename api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/{PlanMaterial.cs => PlanWizardMaterial.cs} (60%) rename api/src/Erp.Platform.EntityFrameworkCore/Migrations/{20251202124644_Initial.Designer.cs => 20251202131047_Initial.Designer.cs} (99%) rename api/src/Erp.Platform.EntityFrameworkCore/Migrations/{20251202124644_Initial.cs => 20251202131047_Initial.cs} (99%) diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json index 00e0e647..fb22c7b7 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json @@ -9501,19 +9501,19 @@ }, { "resourceName": "Platform", - "key": "App.Maintenance.Plan", - "tr": "Bakım Planları", - "en": "Plans" + "key": "App.Maintenance.PlanWizard", + "tr": "Bakım Planı Sihirbazı", + "en": "Planning Wizard" }, { "resourceName": "Platform", - "key": "App.Maintenance.PlanEmployee", + "key": "App.Maintenance.PlanWizardEmployee", "tr": "Personeller", "en": "Employees" }, { "resourceName": "Platform", - "key": "App.Maintenance.PlanMaterial", + "key": "App.Maintenance.PlanWizardMaterial", "tr": "Malzemeler", "en": "Materials" }, @@ -10016,4 +10016,4 @@ "en": "Check & Notes" } ] -} \ No newline at end of file +} diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Maintenance.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Maintenance.cs index 4b3d9940..9db79dd2 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Maintenance.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Maintenance.cs @@ -662,8 +662,8 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend } #endregion - #region Maintenance Plan - listFormName = AppCodes.Maintenance.Plan; + #region Maintenance Plan Wizard + listFormName = AppCodes.Maintenance.PlanWizard; if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == listFormName)) { var listForm = await _listFormRepository.InsertAsync( @@ -683,7 +683,7 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend IsOrganizationUnit = false, Description = listFormName, SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.Plan)), + SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanWizard)), KeyFieldName = "Id", KeyFieldDbSourceType = DbType.Guid, DefaultFilter = DefaultFilterJson, @@ -695,7 +695,7 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(listFormName), - DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Plan)), + DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PlanWizard)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, @@ -1011,8 +1011,8 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend } #endregion - #region Maintenance Plan Material - listFormName = AppCodes.Maintenance.PlanMaterial; + #region Maintenance Plan Wizard Material + listFormName = AppCodes.Maintenance.PlanWizardMaterial; if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == listFormName)) { var listForm = await _listFormRepository.InsertAsync( @@ -1032,7 +1032,7 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend IsOrganizationUnit = false, Description = listFormName, SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanMaterial)), + SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanWizardMaterial)), KeyFieldName = "Id", KeyFieldDbSourceType = DbType.Guid, DefaultFilter = DefaultFilterJson, @@ -1044,7 +1044,7 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(listFormName), - DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PlanMaterial)), + DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PlanWizardMaterial)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, @@ -1118,8 +1118,8 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend } #endregion - #region Maintenance Plan Employee - listFormName = AppCodes.Maintenance.PlanEmployee; + #region Maintenance Plan Wizard Employee + listFormName = AppCodes.Maintenance.PlanWizardEmployee; if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == listFormName)) { var listForm = await _listFormRepository.InsertAsync( @@ -1139,7 +1139,7 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend IsOrganizationUnit = false, Description = listFormName, SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanEmployee)), + SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanWizardEmployee)), KeyFieldName = "Id", KeyFieldDbSourceType = DbType.Guid, DefaultFilter = DefaultFilterJson, @@ -1151,7 +1151,7 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(listFormName), - DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PlanEmployee)), + DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PlanWizardEmployee)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, @@ -1256,29 +1256,29 @@ public class ListFormSeeder_Maintenance : IDataSeedContributor, ITransientDepend // Maintenance Plan ile Maintenance Plan Material ve Maintenance Plan Employee arasında Sub Forms ilişkisinin kurulması await utils.CloneFormLayoutAsync( - AppCodes.Maintenance.Plan, + AppCodes.Maintenance.PlanWizard, JsonSerializer.Serialize(new List() { new { TabType = ListFormTabTypeEnum.List, - TabTitle = AppCodes.Maintenance.PlanMaterial, - Code = AppCodes.Maintenance.PlanMaterial, + TabTitle = AppCodes.Maintenance.PlanWizardMaterial, + Code = AppCodes.Maintenance.PlanWizardMaterial, Relation = new List() { new { ParentFieldName = "Id", DbType = DbType.Guid, - ChildFieldName = "PlanId" + ChildFieldName = "PlanWizardId" } } }, new { TabType = ListFormTabTypeEnum.List, - TabTitle = AppCodes.Maintenance.PlanEmployee, - Code = AppCodes.Maintenance.PlanEmployee, + TabTitle = AppCodes.Maintenance.PlanWizardEmployee, + Code = AppCodes.Maintenance.PlanWizardEmployee, Relation = new List() { new { ParentFieldName = "Id", DbType = DbType.Guid, - ChildFieldName = "PlanId" + ChildFieldName = "PlanWizardId" } } } diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json b/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json index 3c4e3254..a6118ad7 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json @@ -2510,12 +2510,12 @@ }, { "ParentCode": "App.Maintenance", - "Code": "App.Maintenance.Plan", - "DisplayName": "App.Maintenance.Plan", + "Code": "App.Maintenance.PlanWizard", + "DisplayName": "App.Maintenance.PlanWizard", "Order": 3, - "Url": "/admin/list/App.Maintenance.Plan", - "Icon": "FcPlanner", - "RequiredPermissionName": "App.Maintenance.Plan", + "Url": "/admin/list/App.Maintenance.PlanWizard", + "Icon": "FcTimeline", + "RequiredPermissionName": "App.Maintenance.PlanWizard", "IsDisabled": false }, { diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json index 68236289..60c6f1cb 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json @@ -6738,17 +6738,17 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard", "ParentName": null, - "DisplayName": "App.Maintenance.Plan", + "DisplayName": "App.Maintenance.PlanWizard", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan.Create", - "ParentName": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard.Create", + "ParentName": "App.Maintenance.PlanWizard", "DisplayName": "Create", "IsEnabled": true, "MultiTenancySide": 3, @@ -6756,8 +6756,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan.Update", - "ParentName": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard.Update", + "ParentName": "App.Maintenance.PlanWizard", "DisplayName": "Update", "IsEnabled": true, "MultiTenancySide": 3, @@ -6765,8 +6765,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan.Delete", - "ParentName": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard.Delete", + "ParentName": "App.Maintenance.PlanWizard", "DisplayName": "Delete", "IsEnabled": true, "MultiTenancySide": 3, @@ -6774,8 +6774,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan.Export", - "ParentName": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard.Export", + "ParentName": "App.Maintenance.PlanWizard", "DisplayName": "Export", "IsEnabled": true, "MultiTenancySide": 3, @@ -6783,8 +6783,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan.Import", - "ParentName": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard.Import", + "ParentName": "App.Maintenance.PlanWizard", "DisplayName": "Import", "IsEnabled": true, "MultiTenancySide": 3, @@ -6792,8 +6792,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plan.Note", - "ParentName": "App.Maintenance.Plan", + "Name": "App.Maintenance.PlanWizard.Note", + "ParentName": "App.Maintenance.PlanWizard", "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, @@ -6801,17 +6801,17 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial", "ParentName": null, - "DisplayName": "App.Maintenance.PlanMaterial", + "DisplayName": "App.Maintenance.PlanWizardMaterial", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial.Create", - "ParentName": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial.Create", + "ParentName": "App.Maintenance.PlanWizardMaterial", "DisplayName": "Create", "IsEnabled": true, "MultiTenancySide": 3, @@ -6819,8 +6819,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial.Update", - "ParentName": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial.Update", + "ParentName": "App.Maintenance.PlanWizardMaterial", "DisplayName": "Update", "IsEnabled": true, "MultiTenancySide": 3, @@ -6828,8 +6828,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial.Delete", - "ParentName": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial.Delete", + "ParentName": "App.Maintenance.PlanWizardMaterial", "DisplayName": "Delete", "IsEnabled": true, "MultiTenancySide": 3, @@ -6837,8 +6837,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial.Export", - "ParentName": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial.Export", + "ParentName": "App.Maintenance.PlanWizardMaterial", "DisplayName": "Export", "IsEnabled": true, "MultiTenancySide": 3, @@ -6846,8 +6846,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial.Import", - "ParentName": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial.Import", + "ParentName": "App.Maintenance.PlanWizardMaterial", "DisplayName": "Import", "IsEnabled": true, "MultiTenancySide": 3, @@ -6855,8 +6855,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanMaterial.Note", - "ParentName": "App.Maintenance.PlanMaterial", + "Name": "App.Maintenance.PlanWizardMaterial.Note", + "ParentName": "App.Maintenance.PlanWizardMaterial", "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, @@ -6864,17 +6864,17 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee", "ParentName": null, - "DisplayName": "App.Maintenance.PlanEmployee", + "DisplayName": "App.Maintenance.PlanWizardEmployee", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee.Create", - "ParentName": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee.Create", + "ParentName": "App.Maintenance.PlanWizardEmployee", "DisplayName": "Create", "IsEnabled": true, "MultiTenancySide": 3, @@ -6882,8 +6882,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee.Update", - "ParentName": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee.Update", + "ParentName": "App.Maintenance.PlanWizardEmployee", "DisplayName": "Update", "IsEnabled": true, "MultiTenancySide": 3, @@ -6891,8 +6891,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee.Delete", - "ParentName": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee.Delete", + "ParentName": "App.Maintenance.PlanWizardEmployee", "DisplayName": "Delete", "IsEnabled": true, "MultiTenancySide": 3, @@ -6900,8 +6900,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee.Export", - "ParentName": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee.Export", + "ParentName": "App.Maintenance.PlanWizardEmployee", "DisplayName": "Export", "IsEnabled": true, "MultiTenancySide": 3, @@ -6909,8 +6909,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee.Import", - "ParentName": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee.Import", + "ParentName": "App.Maintenance.PlanWizardEmployee", "DisplayName": "Import", "IsEnabled": true, "MultiTenancySide": 3, @@ -6918,8 +6918,8 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.PlanEmployee.Note", - "ParentName": "App.Maintenance.PlanEmployee", + "Name": "App.Maintenance.PlanWizardEmployee.Note", + "ParentName": "App.Maintenance.PlanWizardEmployee", "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, diff --git a/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs b/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs index 5cc10b8c..f7452c79 100644 --- a/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs +++ b/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs @@ -164,9 +164,9 @@ public enum TableNameEnum WorkcenterStatus, Workcenter, WorkcenterSpecification, - Plan, - PlanMaterial, - PlanEmployee, + PlanWizard, + PlanWizardMaterial, + PlanWizardEmployee, Fault, FaultStatus, FaultType, diff --git a/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs b/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs index 57a0519d..c7a31dfe 100644 --- a/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs +++ b/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs @@ -194,9 +194,9 @@ public static class TableNameResolver { nameof(TableNameEnum.WorkcenterStatus), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, { nameof(TableNameEnum.Workcenter), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, { nameof(TableNameEnum.WorkcenterSpecification), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, - { nameof(TableNameEnum.Plan), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, - { nameof(TableNameEnum.PlanMaterial), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, - { nameof(TableNameEnum.PlanEmployee), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, + { nameof(TableNameEnum.PlanWizard), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, + { nameof(TableNameEnum.PlanWizardMaterial), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, + { nameof(TableNameEnum.PlanWizardEmployee), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, { nameof(TableNameEnum.Fault), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, { nameof(TableNameEnum.FaultStatus), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, { nameof(TableNameEnum.FaultType), (TablePrefix.TenantByName, MenuPrefix.Maintenance) }, diff --git a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs index 54fbb493..044b39da 100644 --- a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs @@ -540,9 +540,9 @@ public static class SeedConsts public const string WorkcenterType = Default + ".WorkcenterType"; public const string WorkcenterStatus = Default + ".WorkcenterStatus"; public const string Workcenter = Default + ".Workcenter"; - public const string Plan = Default + ".Plan"; - public const string PlanMaterial = Default + ".PlanMaterial"; - public const string PlanEmployee = Default + ".PlanEmployee"; + public const string PlanWizard = Default + ".PlanWizard"; + public const string PlanWizardMaterial = Default + ".PlanWizardMaterial"; + public const string PlanWizardEmployee = Default + ".PlanWizardEmployee"; public const string Fault = Default + ".Fault"; public const string FaultType = Default + ".FaultType"; public const string FaultStatus = Default + ".FaultStatus"; diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Plan.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizard.cs similarity index 87% rename from api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Plan.cs rename to api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizard.cs index 042a6c81..03d20585 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Plan.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizard.cs @@ -5,7 +5,7 @@ using Volo.Abp.MultiTenancy; namespace Erp.Platform.Entities; -public class Plan : FullAuditedEntity, IMultiTenant +public class PlanWizard : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } @@ -25,6 +25,6 @@ public class Plan : FullAuditedEntity, IMultiTenant // Collections public string RequiredSkillsJson { get; set; } - public List Materials { get; set; } + public List Materials { get; set; } public List Employees { get; set; } } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanEmployee.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizardEmployee.cs similarity index 81% rename from api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanEmployee.cs rename to api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizardEmployee.cs index 2c3c8f75..9d4f7da2 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanEmployee.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizardEmployee.cs @@ -8,8 +8,8 @@ public class PlanEmployee : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } - public Guid PlanId { get; set; } - public Plan Plan { get; set; } + public Guid PlanWizardId { get; set; } + public PlanWizard PlanWizard { get; set; } public Guid EmployeeId { get; set; } public DateTime StartDate { get; set; } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanMaterial.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizardMaterial.cs similarity index 60% rename from api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanMaterial.cs rename to api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizardMaterial.cs index c9a18f41..1776b80e 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanMaterial.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/PlanWizardMaterial.cs @@ -4,12 +4,12 @@ using Volo.Abp.MultiTenancy; namespace Erp.Platform.Entities; -public class PlanMaterial : FullAuditedEntity, IMultiTenant +public class PlanWizardMaterial : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } - public Guid PlanId { get; set; } - public Plan Plan { get; set; } + public Guid PlanWizardId { get; set; } + public PlanWizard PlanWizard { get; set; } public Guid MaterialId { get; set; } public decimal Quantity { get; set; } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workcenter.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workcenter.cs index 120afe62..ea5487bb 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workcenter.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workcenter.cs @@ -35,7 +35,7 @@ public class Workcenter : FullAuditedEntity, IMultiTenant public ICollection Specifications { get; set; } public ICollection Operations { get; set; } - public virtual ICollection Plans { get; set; } + public virtual ICollection PlanWizards { get; set; } public virtual ICollection Workorders { get; set; } // public virtual ICollection DownTimeHistory { get; set; } } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workorder.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workorder.cs index 4f99a4a6..abce9b2f 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workorder.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Maintenance/Workorder.cs @@ -14,7 +14,7 @@ public class Workorder : FullAuditedEntity, IMultiTenant public Workcenter Workcenter { get; set; } public Guid? PlanId { get; set; } - public Plan Plan { get; set; } + public PlanWizard Plan { get; set; } public Guid OrderTypeId { get; set; } //Preventive, Corrective, Emergency, Inspection, Calibration public WorkorderType OrderType { get; set; } diff --git a/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index ce5f2836..33b57a30 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -252,7 +252,7 @@ public class PlatformDbContext : public DbSet WorkcenterStatuses { get; set; } public DbSet Workcenters { get; set; } public DbSet WorkcenterSpecifications { get; set; } - public DbSet Plans { get; set; } + public DbSet Plans { get; set; } public DbSet Faults { get; set; } public DbSet FaultStatuses { get; set; } public DbSet FaultTypes { get; set; } @@ -2824,9 +2824,9 @@ public class PlatformDbContext : .OnDelete(DeleteBehavior.Cascade); }); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Plan)), Prefix.DbSchema); + b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanWizard)), Prefix.DbSchema); b.ConfigureByConvention(); b.Property(x => x.Code).IsRequired().HasMaxLength(100); @@ -2844,37 +2844,37 @@ public class PlatformDbContext : b.Property(x => x.LastExecuted).IsRequired(); b.HasOne(x => x.Workcenter) - .WithMany(x => x.Plans) + .WithMany(x => x.PlanWizards) .HasForeignKey(x => x.WorkcenterId) .OnDelete(DeleteBehavior.Restrict); }); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanMaterial)), Prefix.DbSchema); + b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanWizardMaterial)), Prefix.DbSchema); b.ConfigureByConvention(); - b.Property(x => x.PlanId).IsRequired(); + b.Property(x => x.PlanWizardId).IsRequired(); b.Property(x => x.MaterialId).IsRequired(); b.Property(x => x.Quantity).HasPrecision(18, 2).HasDefaultValue(0); - b.HasOne(x => x.Plan) + b.HasOne(x => x.PlanWizard) .WithMany(x => x.Materials) - .HasForeignKey(x => x.PlanId) + .HasForeignKey(x => x.PlanWizardId) .OnDelete(DeleteBehavior.Cascade); }); builder.Entity(b => { - b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanEmployee)), Prefix.DbSchema); + b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.PlanWizardEmployee)), Prefix.DbSchema); b.ConfigureByConvention(); - b.Property(x => x.PlanId).IsRequired(); + b.Property(x => x.PlanWizardId).IsRequired(); b.Property(x => x.EmployeeId).IsRequired(); - b.HasOne(x => x.Plan) + b.HasOne(x => x.PlanWizard) .WithMany(x => x.Employees) - .HasForeignKey(x => x.PlanId) + .HasForeignKey(x => x.PlanWizardId) .OnDelete(DeleteBehavior.Cascade); }); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202124644_Initial.Designer.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202131047_Initial.Designer.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202124644_Initial.Designer.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202131047_Initial.Designer.cs index 60b53c00..ab179243 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202124644_Initial.Designer.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202131047_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Erp.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251202124644_Initial")] + [Migration("20251202131047_Initial")] partial class Initial { /// @@ -9167,7 +9167,68 @@ namespace Erp.Platform.Migrations b.ToTable("Hr_T_Performance360", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.Plan", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("EmployeeId") + .HasColumnType("uniqueidentifier"); + + b.Property("EndDate") + .HasColumnType("datetime2"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("PlanWizardId") + .HasColumnType("uniqueidentifier"); + + b.Property("StartDate") + .HasColumnType("datetime2"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("PlanWizardId"); + + b.ToTable("Mnt_T_PlanWizardEmployee", (string)null); + }); + + modelBuilder.Entity("Erp.Platform.Entities.PlanWizard", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -9262,71 +9323,10 @@ namespace Erp.Platform.Migrations b.HasIndex("WorkcenterId"); - b.ToTable("Mnt_T_Plan", (string)null); + b.ToTable("Mnt_T_PlanWizard", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasColumnType("nvarchar(max)"); - - b.Property("EmployeeId") - .HasColumnType("uniqueidentifier"); - - b.Property("EndDate") - .HasColumnType("datetime2"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("PlanId") - .HasColumnType("uniqueidentifier"); - - b.Property("StartDate") - .HasColumnType("datetime2"); - - b.Property("TenantId") - .HasColumnType("uniqueidentifier") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("PlanId"); - - b.ToTable("Mnt_T_PlanEmployee", (string)null); - }); - - modelBuilder.Entity("Erp.Platform.Entities.PlanMaterial", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanWizardMaterial", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -9364,7 +9364,7 @@ namespace Erp.Platform.Migrations b.Property("MaterialId") .HasColumnType("uniqueidentifier"); - b.Property("PlanId") + b.Property("PlanWizardId") .HasColumnType("uniqueidentifier"); b.Property("Quantity") @@ -9379,9 +9379,9 @@ namespace Erp.Platform.Migrations b.HasKey("Id"); - b.HasIndex("PlanId"); + b.HasIndex("PlanWizardId"); - b.ToTable("Mnt_T_PlanMaterial", (string)null); + b.ToTable("Mnt_T_PlanWizardMaterial", (string)null); }); modelBuilder.Entity("Erp.Platform.Entities.Product", b => @@ -18020,10 +18020,21 @@ namespace Erp.Platform.Migrations b.Navigation("Template"); }); - modelBuilder.Entity("Erp.Platform.Entities.Plan", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => + { + b.HasOne("Erp.Platform.Entities.PlanWizard", "PlanWizard") + .WithMany("Employees") + .HasForeignKey("PlanWizardId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PlanWizard"); + }); + + modelBuilder.Entity("Erp.Platform.Entities.PlanWizard", b => { b.HasOne("Erp.Platform.Entities.Workcenter", "Workcenter") - .WithMany("Plans") + .WithMany("PlanWizards") .HasForeignKey("WorkcenterId") .OnDelete(DeleteBehavior.Restrict) .IsRequired(); @@ -18031,26 +18042,15 @@ namespace Erp.Platform.Migrations b.Navigation("Workcenter"); }); - modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanWizardMaterial", b => { - b.HasOne("Erp.Platform.Entities.Plan", "Plan") - .WithMany("Employees") - .HasForeignKey("PlanId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Plan"); - }); - - modelBuilder.Entity("Erp.Platform.Entities.PlanMaterial", b => - { - b.HasOne("Erp.Platform.Entities.Plan", "Plan") + b.HasOne("Erp.Platform.Entities.PlanWizard", "PlanWizard") .WithMany("Materials") - .HasForeignKey("PlanId") + .HasForeignKey("PlanWizardId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Plan"); + b.Navigation("PlanWizard"); }); modelBuilder.Entity("Erp.Platform.Entities.Project", b => @@ -18726,7 +18726,7 @@ namespace Erp.Platform.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Erp.Platform.Entities.Plan", "Plan") + b.HasOne("Erp.Platform.Entities.PlanWizard", "Plan") .WithMany() .HasForeignKey("PlanId"); @@ -19250,7 +19250,7 @@ namespace Erp.Platform.Migrations b.Navigation("Items"); }); - modelBuilder.Entity("Erp.Platform.Entities.Plan", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanWizard", b => { b.Navigation("Employees"); @@ -19454,7 +19454,7 @@ namespace Erp.Platform.Migrations { b.Navigation("Operations"); - b.Navigation("Plans"); + b.Navigation("PlanWizards"); b.Navigation("Specifications"); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202124644_Initial.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202131047_Initial.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202124644_Initial.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202131047_Initial.cs index cc64fb19..2eb8b692 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202124644_Initial.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251202131047_Initial.cs @@ -5566,7 +5566,7 @@ namespace Erp.Platform.Migrations }); migrationBuilder.CreateTable( - name: "Mnt_T_Plan", + name: "Mnt_T_PlanWizard", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -5594,9 +5594,9 @@ namespace Erp.Platform.Migrations }, constraints: table => { - table.PrimaryKey("PK_Mnt_T_Plan", x => x.Id); + table.PrimaryKey("PK_Mnt_T_PlanWizard", x => x.Id); table.ForeignKey( - name: "FK_Mnt_T_Plan_Mnt_T_Workcenter_WorkcenterId", + name: "FK_Mnt_T_PlanWizard_Mnt_T_Workcenter_WorkcenterId", column: x => x.WorkcenterId, principalTable: "Mnt_T_Workcenter", principalColumn: "Id", @@ -6256,12 +6256,12 @@ namespace Erp.Platform.Migrations }); migrationBuilder.CreateTable( - name: "Mnt_T_PlanEmployee", + name: "Mnt_T_PlanWizardEmployee", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), - PlanId = table.Column(type: "uniqueidentifier", nullable: false), + PlanWizardId = table.Column(type: "uniqueidentifier", nullable: false), EmployeeId = table.Column(type: "uniqueidentifier", nullable: false), StartDate = table.Column(type: "datetime2", nullable: false), EndDate = table.Column(type: "datetime2", nullable: false), @@ -6276,22 +6276,22 @@ namespace Erp.Platform.Migrations }, constraints: table => { - table.PrimaryKey("PK_Mnt_T_PlanEmployee", x => x.Id); + table.PrimaryKey("PK_Mnt_T_PlanWizardEmployee", x => x.Id); table.ForeignKey( - name: "FK_Mnt_T_PlanEmployee_Mnt_T_Plan_PlanId", - column: x => x.PlanId, - principalTable: "Mnt_T_Plan", + name: "FK_Mnt_T_PlanWizardEmployee_Mnt_T_PlanWizard_PlanWizardId", + column: x => x.PlanWizardId, + principalTable: "Mnt_T_PlanWizard", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( - name: "Mnt_T_PlanMaterial", + name: "Mnt_T_PlanWizardMaterial", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), - PlanId = table.Column(type: "uniqueidentifier", nullable: false), + PlanWizardId = table.Column(type: "uniqueidentifier", nullable: false), MaterialId = table.Column(type: "uniqueidentifier", nullable: false), Quantity = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false, defaultValue: 0m), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -6304,11 +6304,11 @@ namespace Erp.Platform.Migrations }, constraints: table => { - table.PrimaryKey("PK_Mnt_T_PlanMaterial", x => x.Id); + table.PrimaryKey("PK_Mnt_T_PlanWizardMaterial", x => x.Id); table.ForeignKey( - name: "FK_Mnt_T_PlanMaterial_Mnt_T_Plan_PlanId", - column: x => x.PlanId, - principalTable: "Mnt_T_Plan", + name: "FK_Mnt_T_PlanWizardMaterial_Mnt_T_PlanWizard_PlanWizardId", + column: x => x.PlanWizardId, + principalTable: "Mnt_T_PlanWizard", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -6349,9 +6349,9 @@ namespace Erp.Platform.Migrations { table.PrimaryKey("PK_Workorders", x => x.Id); table.ForeignKey( - name: "FK_Workorders_Mnt_T_Plan_PlanId", + name: "FK_Workorders_Mnt_T_PlanWizard_PlanId", column: x => x.PlanId, - principalTable: "Mnt_T_Plan", + principalTable: "Mnt_T_PlanWizard", principalColumn: "Id"); table.ForeignKey( name: "FK_Workorders_Mnt_T_Workcenter_WorkcenterId", @@ -7900,19 +7900,19 @@ namespace Erp.Platform.Migrations column: "WorkcenterId"); migrationBuilder.CreateIndex( - name: "IX_Mnt_T_Plan_WorkcenterId", - table: "Mnt_T_Plan", + name: "IX_Mnt_T_PlanWizard_WorkcenterId", + table: "Mnt_T_PlanWizard", column: "WorkcenterId"); migrationBuilder.CreateIndex( - name: "IX_Mnt_T_PlanEmployee_PlanId", - table: "Mnt_T_PlanEmployee", - column: "PlanId"); + name: "IX_Mnt_T_PlanWizardEmployee_PlanWizardId", + table: "Mnt_T_PlanWizardEmployee", + column: "PlanWizardId"); migrationBuilder.CreateIndex( - name: "IX_Mnt_T_PlanMaterial_PlanId", - table: "Mnt_T_PlanMaterial", - column: "PlanId"); + name: "IX_Mnt_T_PlanWizardMaterial_PlanWizardId", + table: "Mnt_T_PlanWizardMaterial", + column: "PlanWizardId"); migrationBuilder.CreateIndex( name: "IX_Mnt_T_Workcenter_DepartmentId", @@ -8919,10 +8919,10 @@ namespace Erp.Platform.Migrations name: "Mnt_T_Fault"); migrationBuilder.DropTable( - name: "Mnt_T_PlanEmployee"); + name: "Mnt_T_PlanWizardEmployee"); migrationBuilder.DropTable( - name: "Mnt_T_PlanMaterial"); + name: "Mnt_T_PlanWizardMaterial"); migrationBuilder.DropTable( name: "Mnt_T_WorkcenterSpecification"); @@ -9318,7 +9318,7 @@ namespace Erp.Platform.Migrations name: "Str_T_ZoneType"); migrationBuilder.DropTable( - name: "Mnt_T_Plan"); + name: "Mnt_T_PlanWizard"); migrationBuilder.DropTable( name: "Mnt_T_WorkorderStatus"); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 74d02369..9b957e38 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -9164,7 +9164,68 @@ namespace Erp.Platform.Migrations b.ToTable("Hr_T_Performance360", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.Plan", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("EmployeeId") + .HasColumnType("uniqueidentifier"); + + b.Property("EndDate") + .HasColumnType("datetime2"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("PlanWizardId") + .HasColumnType("uniqueidentifier"); + + b.Property("StartDate") + .HasColumnType("datetime2"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("PlanWizardId"); + + b.ToTable("Mnt_T_PlanWizardEmployee", (string)null); + }); + + modelBuilder.Entity("Erp.Platform.Entities.PlanWizard", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -9259,71 +9320,10 @@ namespace Erp.Platform.Migrations b.HasIndex("WorkcenterId"); - b.ToTable("Mnt_T_Plan", (string)null); + b.ToTable("Mnt_T_PlanWizard", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasColumnType("nvarchar(max)"); - - b.Property("EmployeeId") - .HasColumnType("uniqueidentifier"); - - b.Property("EndDate") - .HasColumnType("datetime2"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("PlanId") - .HasColumnType("uniqueidentifier"); - - b.Property("StartDate") - .HasColumnType("datetime2"); - - b.Property("TenantId") - .HasColumnType("uniqueidentifier") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("PlanId"); - - b.ToTable("Mnt_T_PlanEmployee", (string)null); - }); - - modelBuilder.Entity("Erp.Platform.Entities.PlanMaterial", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanWizardMaterial", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -9361,7 +9361,7 @@ namespace Erp.Platform.Migrations b.Property("MaterialId") .HasColumnType("uniqueidentifier"); - b.Property("PlanId") + b.Property("PlanWizardId") .HasColumnType("uniqueidentifier"); b.Property("Quantity") @@ -9376,9 +9376,9 @@ namespace Erp.Platform.Migrations b.HasKey("Id"); - b.HasIndex("PlanId"); + b.HasIndex("PlanWizardId"); - b.ToTable("Mnt_T_PlanMaterial", (string)null); + b.ToTable("Mnt_T_PlanWizardMaterial", (string)null); }); modelBuilder.Entity("Erp.Platform.Entities.Product", b => @@ -18017,10 +18017,21 @@ namespace Erp.Platform.Migrations b.Navigation("Template"); }); - modelBuilder.Entity("Erp.Platform.Entities.Plan", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => + { + b.HasOne("Erp.Platform.Entities.PlanWizard", "PlanWizard") + .WithMany("Employees") + .HasForeignKey("PlanWizardId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("PlanWizard"); + }); + + modelBuilder.Entity("Erp.Platform.Entities.PlanWizard", b => { b.HasOne("Erp.Platform.Entities.Workcenter", "Workcenter") - .WithMany("Plans") + .WithMany("PlanWizards") .HasForeignKey("WorkcenterId") .OnDelete(DeleteBehavior.Restrict) .IsRequired(); @@ -18028,26 +18039,15 @@ namespace Erp.Platform.Migrations b.Navigation("Workcenter"); }); - modelBuilder.Entity("Erp.Platform.Entities.PlanEmployee", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanWizardMaterial", b => { - b.HasOne("Erp.Platform.Entities.Plan", "Plan") - .WithMany("Employees") - .HasForeignKey("PlanId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Plan"); - }); - - modelBuilder.Entity("Erp.Platform.Entities.PlanMaterial", b => - { - b.HasOne("Erp.Platform.Entities.Plan", "Plan") + b.HasOne("Erp.Platform.Entities.PlanWizard", "PlanWizard") .WithMany("Materials") - .HasForeignKey("PlanId") + .HasForeignKey("PlanWizardId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Plan"); + b.Navigation("PlanWizard"); }); modelBuilder.Entity("Erp.Platform.Entities.Project", b => @@ -18723,7 +18723,7 @@ namespace Erp.Platform.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Erp.Platform.Entities.Plan", "Plan") + b.HasOne("Erp.Platform.Entities.PlanWizard", "Plan") .WithMany() .HasForeignKey("PlanId"); @@ -19247,7 +19247,7 @@ namespace Erp.Platform.Migrations b.Navigation("Items"); }); - modelBuilder.Entity("Erp.Platform.Entities.Plan", b => + modelBuilder.Entity("Erp.Platform.Entities.PlanWizard", b => { b.Navigation("Employees"); @@ -19451,7 +19451,7 @@ namespace Erp.Platform.Migrations { b.Navigation("Operations"); - b.Navigation("Plans"); + b.Navigation("PlanWizards"); b.Navigation("Specifications"); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs index 88bfae90..b8dfa38a 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs @@ -108,7 +108,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency private readonly IRepository _workcenterTypeRepository; private readonly IRepository _workcenterStatusRepository; private readonly IRepository _workcenterRepository; - private readonly IRepository _maintenancePlanRepository; + private readonly IRepository _maintenancePlanRepository; private readonly IRepository _faultRepository; private readonly IRepository _faultStatusRepository; private readonly IRepository _faultTypeRepository; @@ -230,7 +230,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency IRepository workcenterTypeRepository, IRepository workcenterStatusRepository, IRepository workcenterRepository, - IRepository maintenancePlanRepository, + IRepository maintenancePlanRepository, IRepository faultRepository, IRepository faultStatusRepository, IRepository faultTypeRepository, @@ -2072,7 +2072,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency var workcenter = await _workcenterRepository.FirstOrDefaultAsync(x => x.Code == item.WorkCenterCode); - await _maintenancePlanRepository.InsertAsync(new Plan + await _maintenancePlanRepository.InsertAsync(new PlanWizard { Code = item.Code, WorkcenterId = workcenter?.Id,