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

Фикс импорт ГГД

Browse Source
This commit is contained in:
Степанов Дмитрий 2024-04-15 07:48:58 +03:00
parent 7c88fb23de
commit 71e0e6356a
7 changed files with 9440 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9399
AsbCloudDb/Migrations/20240415043251_Update_WellOperationName.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

32
AsbCloudDb/Migrations/20240415043251_Update_WellOperationName.cs Normal file
View File

@ -0,0 +1,32 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
/// <inheritdoc />
public partial class Update_WellOperationName : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5089,
column: "name",
value: "Спуск КО на транспортной колонне");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "t_well_operation_category",
keyColumn: "id",
keyValue: 5089,
column: "name",
value: "Спуск КО на транспотрной колонне");
}
}
}

12
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -284,7 +284,7 @@ namespace AsbCloudDb.Migrations
.HasColumnName("date")
.HasComment("Дата формирования отчёта");
b.Property<DateTime?>("DateLastUpdate")
b.Property<DateTimeOffset?>("DateLastUpdate")
.HasColumnType("timestamp with time zone")
.HasColumnName("date_last_update")
.HasComment("Дата последнего обновления");
@ -1418,7 +1418,7 @@ namespace AsbCloudDb.Migrations
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<DateTime>("DateDownload")
b.Property<DateTimeOffset>("DateDownload")
.HasColumnType("timestamp with time zone")
.HasColumnName("date_download")
.HasComment("Дата загрузки");
@ -1613,17 +1613,17 @@ namespace AsbCloudDb.Migrations
.HasColumnName("message")
.HasComment("Сообщение уведомления");
b.Property<DateTime?>("ReadDate")
b.Property<DateTimeOffset?>("ReadDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("read_date")
.HasComment("Дата прочтения уведомления");
b.Property<DateTime>("RegistrationDate")
b.Property<DateTimeOffset>("RegistrationDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("registration_date")
.HasComment("Дата регистрации уведомления");
b.Property<DateTime?>("SentDate")
b.Property<DateTimeOffset?>("SentDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("sent_date")
.HasComment("Дата отправки уведомления");
@ -7136,7 +7136,7 @@ namespace AsbCloudDb.Migrations
IdParent = 4005,
KeyValueName = "dT",
KeyValueUnits = "мин",
Name = "Спуск КО на транспотрной колонне"
Name = "Спуск КО на транспортной колонне"
},
new
{

2
AsbCloudDb/Model/WellOperationCategory.cs
View File

@ -358,7 +358,7 @@ namespace AsbCloudDb.Model
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 = 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 = "мин" },

BIN
AsbCloudInfrastructure/Services/WellOperations/Templates/WellOperationFactTemplate.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/WellOperations/Templates/WellOperationPlanTemplate.xlsx
View File

Binary file not shown.

4
AsbCloudInfrastructure/Services/WellOperations/WellOperationParser.cs
View File

@ -50,7 +50,7 @@ public class WellOperationParser<TTemplateParameters> : ExcelWellRelatedParser<W
var message = string.Format(XLExtentions.ProblemDetailsTemplate,
TemplateParameters.SheetName,
rowNumber,
TemplateParameters.Cells[nameof(WellOperationDto.WellSectionTypeCaption)],
TemplateParameters.Cells[nameof(WellOperationDto.WellSectionTypeCaption)].ColumnNumber,
"Указана некорректная секция");
throw new FileFormatException(message);
}
@ -63,7 +63,7 @@ public class WellOperationParser<TTemplateParameters> : ExcelWellRelatedParser<W
var message = string.Format(XLExtentions.ProblemDetailsTemplate,
TemplateParameters.SheetName,
rowNumber,
TemplateParameters.Cells[nameof(WellOperationDto.OperationCategoryName)],
TemplateParameters.Cells[nameof(WellOperationDto.OperationCategoryName)].ColumnNumber,
"Указана некорректная операция");
throw new FileFormatException(message);
}