diff --git a/AsbCloudDb/Migrations/20221202193616_WellOperation_Manual_updateIdCategory.cs b/AsbCloudDb/Migrations/20221202193616_WellOperation_Manual_updateIdCategory.cs index 224daa10..4cde82fa 100644 --- a/AsbCloudDb/Migrations/20221202193616_WellOperation_Manual_updateIdCategory.cs +++ b/AsbCloudDb/Migrations/20221202193616_WellOperation_Manual_updateIdCategory.cs @@ -46,7 +46,9 @@ namespace AsbCloudDb.Migrations "UPDATE public.t_well_operation SET id_category=60004 WHERE id_category=9; " + "UPDATE public.t_well_operation SET id_category=60028 WHERE id_category=11; " + "UPDATE public.t_well_operation SET id_category=60014 WHERE id_category=1021; " + - "UPDATE public.t_well_operation SET id_category=60026 WHERE id_category=1022;"); + "UPDATE public.t_well_operation SET id_category=60026 WHERE id_category=1022; " + + "UPDATE public.t_well_operation SET id_category=60014 WHERE id_category=22; " + + "UPDATE public.t_well_operation SET id_category=60014 WHERE id_category=1027; "); } protected override void Down(MigrationBuilder migrationBuilder) diff --git a/AsbCloudDb/Migrations/20221202195803_delete_old_WellOperationCategory.cs b/AsbCloudDb/Migrations/20221202195803_delete_old_WellOperationCategory.cs index a0722545..2d0f5b65 100644 --- a/AsbCloudDb/Migrations/20221202195803_delete_old_WellOperationCategory.cs +++ b/AsbCloudDb/Migrations/20221202195803_delete_old_WellOperationCategory.cs @@ -73,6 +73,11 @@ namespace AsbCloudDb.Migrations keyColumn: "id", keyValue: 21); + migrationBuilder.DeleteData( + table: "t_well_operation_category", + keyColumn: "id", + keyValue: 22); + migrationBuilder.DeleteData( table: "t_well_operation_category", keyColumn: "id", @@ -128,6 +133,11 @@ namespace AsbCloudDb.Migrations keyColumn: "id", keyValue: 1028); + migrationBuilder.DeleteData( + table: "t_well_operation_category", + keyColumn: "id", + keyValue: 1027); + migrationBuilder.DeleteData( table: "t_well_operation_category", keyColumn: "id", @@ -230,13 +240,7 @@ namespace AsbCloudDb.Migrations keyValue: 20, column: "id_parent", value: 4003); - - migrationBuilder.UpdateData( - table: "t_well_operation_category", - keyColumn: "id", - keyValue: 22, - column: "id_parent", - value: 4012); + migrationBuilder.UpdateData( table: "t_well_operation_category", @@ -299,14 +303,7 @@ namespace AsbCloudDb.Migrations keyColumn: "id", keyValue: 1026, column: "id_parent", - value: 4000); - - migrationBuilder.UpdateData( - table: "t_well_operation_category", - keyColumn: "id", - keyValue: 1027, - column: "id_parent", - value: 4012); + value: 4000); migrationBuilder.UpdateData( table: "t_well_operation_category", @@ -532,6 +529,7 @@ namespace AsbCloudDb.Migrations { 13, null, "dT", "мин", "Промывка с вращением" }, { 15, null, "dT", "мин", "Неподвижное состояние" }, { 21, null, "dT", "мин", "Статический замер телесистемы" }, + { 22, null, "dT", "мин", "Промывка" }, { 23, null, "dT", "мин", "Шаблонировка при бурении" }, { 1001, null, "МСП", "м/ч", "Бурение" }, { 1002, null, "dT", "мин", "ГИС" }, @@ -542,6 +540,7 @@ namespace AsbCloudDb.Migrations { 1019, null, "dT", "мин", "Наращивание, промывка" }, { 1021, null, "dT", "мин", "Подъем инструмента с промывкой" }, { 1022, null, "dT", "мин", "Обратная проработка" }, + { 1027, null, "dT", "мин", "Промывка" }, { 1028, null, "dT", "мин", "Промежуточная промывка" }, { 1029, null, "dT", "мин", "Прокачка пачек" }, { 1031, null, "dT", "мин", "Ремонт" }, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs b/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs index c3da707e..d9c8958e 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs @@ -7,8 +7,7 @@ new () {Id = 14, IdParent = 4004, Name = "Удержание в клиньях" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 18, IdParent = 4003, Name = "Проработка перед наращиванием" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 19, IdParent = 4003, Name = "Шаблонировка перед наращиванием" , KeyValueName = "dT", KeyValueUnits = "мин" }, - new () {Id = 20, IdParent = 4003, Name = "Промывка перед наращиванием" , KeyValueName = "dT", KeyValueUnits = "мин" }, - new () {Id = 22, IdParent = 4012 , Name = "Промывка" , KeyValueName = "dT", KeyValueUnits = "мин" }, + new () {Id = 20, IdParent = 4003, Name = "Промывка перед наращиванием" , KeyValueName = "dT", KeyValueUnits = "мин" }, // Операции ручного ввода new () {Id = 1004, IdParent = 4013, Name = "Монтаж ПВО" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 1005, IdParent = 4013, Name = "Демонтаж ПВО" , KeyValueName = "dT", KeyValueUnits = "мин" }, @@ -18,8 +17,7 @@ new () {Id = 1018, IdParent = 4013, Name = "Перетяжка талевого каната" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 1020, IdParent = 4005, Name = "Подъем инструмента" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 1025, IdParent = 4000, Name = "Сборка КНБК" , KeyValueName = "dT", KeyValueUnits = "мин" }, - new () {Id = 1026, IdParent = 4000, Name = "Разборка КНБК" , KeyValueName = "dT", KeyValueUnits = "мин" }, - new () {Id = 1027, IdParent = 4012, Name = "Промывка" , KeyValueName = "dT", KeyValueUnits = "мин" }, + new () {Id = 1026, IdParent = 4000, Name = "Разборка КНБК" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 1030, IdParent = 4012, Name = "Разбуривание тех.оснастки" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 1032, IdParent = 4005, Name = "Спуск инструмента" , KeyValueName = "dT", KeyValueUnits = "мин" }, new () {Id = 1044, IdParent = 4013, Name = "ВМР" , KeyValueName = "dT", KeyValueUnits = "мин" },