on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev

Browse Source
This commit is contained in:
ngfrolov 2023-03-02 09:32:50 +05:00
commit 1c21d9abae
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
8 changed files with 14749 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7188
AsbCloudDb/Migrations/20230301063610_add_new_OperationCategory.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

142
AsbCloudDb/Migrations/20230301063610_add_new_OperationCategory.cs Normal file
View File

@ -0,0 +1,142 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class add_new_OperationCategory : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.InsertData(
table: "t_well_operation_category",
columns: new[] { "id", "id_parent", "key_value_name", "key_value_units", "name" },
values: new object[,]
{
{ 5082, 4000, "dT", "мин", "Сборка устройства ориентирования КО" },
{ 5083, 4003, "dT", "мин", "Проработка принудительная" },
{ 5084, 4005, "dT", "мин", "Шаблонировка подъем БИ, продувка" },
{ 5085, 4005, "dT", "мин", "Спуск бурильного инструмента со сборкой с мостков" },
{ 5086, 4005, "dT", "мин", "Подъем БИ с выбросом на мостки" },
{ 5087, 4005, "dT", "мин", "Спуск БИ со сборкой с мостков" },
{ 5088, 4005, "dT", "мин", "Сборка и спуск ТБТ" },
{ 5089, 4005, "dT", "мин", "Спуск КО на транспотрной колонне" },
{ 5090, 4008, "dT", "мин", "Отворот допускной трубы" },
{ 5091, 4008, "dT", "мин", "Активация подвески, опрессовка" },
{ 5092, 4008, "dT", "мин", "Монтаж, опрессовка ФА" },
{ 5093, 4008, "dT", "мин", "Сборка хвостовика 114мм (согласно схеме)" },
{ 5094, 4008, "dT", "мин", "ПЗР к спуску УЭЦН" },
{ 5095, 4008, "dT", "мин", "Активация подвески (потайной колонны, хвостовика)" },
{ 5096, 4008, "dT", "мин", "Шаблонирование перед спуском" },
{ 5097, 4012, "dT", "мин", "Промывка - перевод скважины на новый раствор" },
{ 5098, 4013, "dT", "мин", "Сборка БИ с мостков на подсвечник" },
{ 5099, 4013, "dT", "мин", "Подготовка ствола скважины. Перезапись ГК в интервале установки КО." },
{ 5100, 4013, "dT", "мин", "Смена рабочего переводника ВСП" },
{ 5101, 4014, "dT", "мин", "Ремонт" }
});
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5082);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5083);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5084);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5085);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5086);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5087);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5088);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5089);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5090);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5091);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5092);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5093);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5094);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5095);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5096);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5097);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5098);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5099);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5100);
migrationBuilder.DeleteData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5101);
}
}
}

7188
AsbCloudDb/Migrations/20230301070621_rename_OperationCategory_Rotor_Slide.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

43
AsbCloudDb/Migrations/20230301070621_rename_OperationCategory_Rotor_Slide.cs Normal file
View File

@ -0,0 +1,43 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class rename_OperationCategory_Rotor_Slide : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5002,
column: "name",
value: "Бурение слайдом");
migrationBuilder.UpdateData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5003,
column: "name",
value: "Бурение ротором");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5002,
column: "name",
value: "Направленно (СЛАЙД)");
migrationBuilder.UpdateData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5003,
column: "name",
value: "Ротором (РУС)");
}
}
}

164
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -4695,7 +4695,7 @@ namespace AsbCloudDb.Migrations
IdParent = 4001,
KeyValueName = "МСП",
KeyValueUnits = "м/ч",
Name = "Направленно (СЛАЙД)"
Name = "Бурение слайдом"
},
new
{
@ -4703,7 +4703,7 @@ namespace AsbCloudDb.Migrations
IdParent = 4001,
KeyValueName = "МСП",
KeyValueUnits = "м/ч",
Name = "Ротором (РУС)"
Name = "Бурение ротором"
},
new
{
@ -5312,6 +5312,166 @@ namespace AsbCloudDb.Migrations
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Ревизия КНБК/инструмента/ЗТС"
},
new
{
Id = 5082,
IdParent = 4000,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Сборка устройства ориентирования КО"
},
new
{
Id = 5083,
IdParent = 4003,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Проработка принудительная"
},
new
{
Id = 5084,
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Шаблонировка подъем БИ, продувка"
},
new
{
Id = 5085,
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Спуск бурильного инструмента со сборкой с мостков"
},
new
{
Id = 5086,
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Подъем БИ с выбросом на мостки"
},
new
{
Id = 5087,
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Спуск БИ со сборкой с мостков"
},
new
{
Id = 5088,
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Сборка и спуск ТБТ"
},
new
{
Id = 5089,
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Спуск КО на транспотрной колонне"
},
new
{
Id = 5090,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Отворот допускной трубы"
},
new
{
Id = 5091,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Активация подвески, опрессовка"
},
new
{
Id = 5092,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Монтаж, опрессовка ФА"
},
new
{
Id = 5093,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Сборка хвостовика 114мм (согласно схеме)"
},
new
{
Id = 5094,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "ПЗР к спуску УЭЦН"
},
new
{
Id = 5095,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Активация подвески (потайной колонны, хвостовика)"
},
new
{
Id = 5096,
IdParent = 4008,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Шаблонирование перед спуском"
},
new
{
Id = 5097,
IdParent = 4012,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Промывка - перевод скважины на новый раствор"
},
new
{
Id = 5098,
IdParent = 4013,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Сборка БИ с мостков на подсвечник"
},
new
{
Id = 5099,
IdParent = 4013,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Подготовка ствола скважины. Перезапись ГК в интервале установки КО."
},
new
{
Id = 5100,
IdParent = 4013,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Смена рабочего переводника ВСП"
},
new
{
Id = 5101,
IdParent = 4014,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Ремонт"
});
});

26
AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs
View File

@ -35,8 +35,8 @@
//переименованные категории с новым ИД
new () {Id = WellOperationCategory.IdBhaDisassembly, IdParent = 4000, Name = "Разборка КНБК", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = WellOperationCategory.IdBhaAssembly, IdParent = 4000, Name = "Сборка КНБК", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = WellOperationCategory.IdSlide, IdParent = 4001, Name = "Направленно (СЛАЙД)", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
new () {Id = WellOperationCategory.IdRotor, IdParent = 4001, Name = "Ротором (РУС)", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
new () {Id = WellOperationCategory.IdSlide, IdParent = 4001, Name = "Бурение слайдом", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
new () {Id = WellOperationCategory.IdRotor, IdParent = 4001, Name = "Бурение ротором", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
new () {Id = WellOperationCategory.IdStaticSurveying, IdParent = 4002, Name = "Замер ЗТС (запись MWD)", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = WellOperationCategory.IdFlashingBeforeConnection, IdParent = 4003, Name = "Промывка перед наращиванием", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5006, IdParent = 4003, Name = "Проработка во время бурения", KeyValueName = "dT", KeyValueUnits = "мин" },
@ -112,7 +112,27 @@
new () {Id = 5076, IdParent = 4017, Name = "НПВ / прочее", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5077, IdParent = 4017, Name = "Обработка раствора (несоответствие параметров)", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5078, IdParent = 4017, Name = "подъем ОК", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5079, IdParent = 4017, Name = "Ревизия КНБК/инструмента/ЗТС", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5079, IdParent = 4017, Name = "Ревизия КНБК/инструмента/ЗТС", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5082, IdParent = 4000, Name = "Сборка устройства ориентирования КО", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5083, IdParent = 4003, Name = "Проработка принудительная", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5084, IdParent = 4005, Name = "Шаблонировка подъем БИ, продувка", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5085, IdParent = 4005, Name = "Спуск бурильного инструмента со сборкой с мостков", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5086, IdParent = 4005, Name = "Подъем БИ с выбросом на мостки", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5087, IdParent = 4005, Name = "Спуск БИ со сборкой с мостков", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5088, IdParent = 4005, Name = "Сборка и спуск ТБТ", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5089, IdParent = 4005, Name = "Спуск КО на транспотрной колонне", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5090, IdParent = 4008, Name = "Отворот допускной трубы", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5091, IdParent = 4008, Name = "Активация подвески, опрессовка", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5092, IdParent = 4008, Name = "Монтаж, опрессовка ФА", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5093, IdParent = 4008, Name = "Сборка хвостовика 114мм (согласно схеме)", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5094, IdParent = 4008, Name = "ПЗР к спуску УЭЦН", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5095, IdParent = 4008, Name = "Активация подвески (потайной колонны, хвостовика)", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5096, IdParent = 4008, Name = "Шаблонирование перед спуском", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5097, IdParent = 4012, Name = "Промывка - перевод скважины на новый раствор", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5098, IdParent = 4013, Name = "Сборка БИ с мостков на подсвечник", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5099, IdParent = 4013, Name = "Подготовка ствола скважины. Перезапись ГК в интервале установки КО.", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5100, IdParent = 4013, Name = "Смена рабочего переводника ВСП", KeyValueName = "dT", KeyValueUnits = "мин" },
new () {Id = 5101, IdParent = 4014, Name = "Ремонт", KeyValueName = "dT", KeyValueUnits = "мин" },
};
}
}

5
AsbCloudDb/Model/WellOperationCategory.cs
View File

@ -33,11 +33,11 @@ namespace AsbCloudDb.Model
/// </summary>
public const int IdBhaAssembly = 5001;
/// <summary>
/// Направленно (СЛАЙД)
/// Бурение слайдом
/// </summary>
public const int IdSlide = 5002;
/// <summary>
/// Ротором (РУС)
/// Бурение ротором
/// </summary>
public const int IdRotor = 5003;
/// <summary>
@ -110,6 +110,7 @@ namespace AsbCloudDb.Model
5077,
5078,
5079,
5101,
4014,
4015,

BIN
AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx
View File

Binary file not shown.