diff --git a/AsbCloudDb/Migrations/20240403143143_Add_NewWellOperationCategories.Designer.cs b/AsbCloudDb/Migrations/20240404064028_Add_NewWellOperationCategories.Designer.cs similarity index 99% rename from AsbCloudDb/Migrations/20240403143143_Add_NewWellOperationCategories.Designer.cs rename to AsbCloudDb/Migrations/20240404064028_Add_NewWellOperationCategories.Designer.cs index 3f2746c7..905664c7 100644 --- a/AsbCloudDb/Migrations/20240403143143_Add_NewWellOperationCategories.Designer.cs +++ b/AsbCloudDb/Migrations/20240404064028_Add_NewWellOperationCategories.Designer.cs @@ -13,7 +13,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace AsbCloudDb.Migrations { [DbContext(typeof(AsbCloudDbContext))] - [Migration("20240403143143_Add_NewWellOperationCategories")] + [Migration("20240404064028_Add_NewWellOperationCategories")] partial class Add_NewWellOperationCategories { /// @@ -22,7 +22,7 @@ namespace AsbCloudDb.Migrations #pragma warning disable 612, 618 modelBuilder .UseCollation("Russian_Russia.1251") - .HasAnnotation("ProductVersion", "8.0.3") + .HasAnnotation("ProductVersion", "8.0.2") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "adminpack"); @@ -7353,6 +7353,22 @@ namespace AsbCloudDb.Migrations KeyValueName = "dT", KeyValueUnits = "мин", Name = "Спуск НКТ" + }, + new + { + Id = 5116, + IdParent = 4013, + KeyValueName = "dT", + KeyValueUnits = "мин", + Name = "Фрезерование \"Окна\"" + }, + new + { + Id = 5117, + IdParent = 4013, + KeyValueName = "dT", + KeyValueUnits = "мин", + Name = "Расширение ствола" }); }); diff --git a/AsbCloudDb/Migrations/20240403143143_Add_NewWellOperationCategories.cs b/AsbCloudDb/Migrations/20240404064028_Add_NewWellOperationCategories.cs similarity index 81% rename from AsbCloudDb/Migrations/20240403143143_Add_NewWellOperationCategories.cs rename to AsbCloudDb/Migrations/20240404064028_Add_NewWellOperationCategories.cs index a0d0e2a9..396700c4 100644 --- a/AsbCloudDb/Migrations/20240403143143_Add_NewWellOperationCategories.cs +++ b/AsbCloudDb/Migrations/20240404064028_Add_NewWellOperationCategories.cs @@ -20,6 +20,8 @@ namespace AsbCloudDb.Migrations { 3006, null, "dT", "мин", "Заключительные работы" }, { 5113, 4001, "МСП", "м/ч", "Бурение" }, { 5114, 4013, "dT", "мин", "ТО оборудования" }, + { 5116, 4013, "dT", "мин", "Фрезерование \"Окна\"" }, + { 5117, 4013, "dT", "мин", "Расширение ствола" }, { 4019, 3006, "dT", "мин", "Заключительные операции" }, { 5115, 4019, "dT", "мин", "Спуск НКТ" } }); @@ -46,6 +48,16 @@ namespace AsbCloudDb.Migrations keyColumn: "id", keyValue: 5115); + migrationBuilder.DeleteData( + table: "t_well_operation_category", + keyColumn: "id", + keyValue: 5116); + + migrationBuilder.DeleteData( + table: "t_well_operation_category", + keyColumn: "id", + keyValue: 5117); + migrationBuilder.DeleteData( table: "t_well_operation_category", keyColumn: "id", diff --git a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs index 4e932c83..495d5897 100644 --- a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs +++ b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace AsbCloudDb.Migrations #pragma warning disable 612, 618 modelBuilder .UseCollation("Russian_Russia.1251") - .HasAnnotation("ProductVersion", "8.0.3") + .HasAnnotation("ProductVersion", "8.0.2") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "adminpack"); @@ -7350,6 +7350,22 @@ namespace AsbCloudDb.Migrations KeyValueName = "dT", KeyValueUnits = "мин", Name = "Спуск НКТ" + }, + new + { + Id = 5116, + IdParent = 4013, + KeyValueName = "dT", + KeyValueUnits = "мин", + Name = "Фрезерование \"Окна\"" + }, + new + { + Id = 5117, + IdParent = 4013, + KeyValueName = "dT", + KeyValueUnits = "мин", + Name = "Расширение ствола" }); }); diff --git a/AsbCloudDb/Model/WellOperationCategory.cs b/AsbCloudDb/Model/WellOperationCategory.cs index 279246bb..a6e6fa57 100644 --- a/AsbCloudDb/Model/WellOperationCategory.cs +++ b/AsbCloudDb/Model/WellOperationCategory.cs @@ -397,6 +397,8 @@ namespace AsbCloudDb.Model new () {Id = 5113, IdParent = 4001, Name = "Бурение", KeyValueName = "МСП", KeyValueUnits = "м/ч"}, new () {Id = 5114, IdParent = 4013, Name = "ТО оборудования", KeyValueName = "dT", KeyValueUnits = "мин"}, new () {Id = 5115, IdParent = IdFinalOperations, Name = "Спуск НКТ", KeyValueName = "dT", KeyValueUnits = "мин"}, + new () {Id = 5116, IdParent = IdAuxiliaryWork, Name = "Фрезерование \"Окна\"", KeyValueName = "dT", KeyValueUnits = "мин"}, + new () {Id = 5117, IdParent = IdAuxiliaryWork, Name = "Расширение ствола", KeyValueName = "dT", KeyValueUnits = "мин"}, }; #endregion