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

Merge pull request 'fix/process_map, правка багов по РТК' (#289) from fix/process_map into dev

Browse Source 
Reviewed-on: https://test.digitaldrilling.ru:8443/DDrilling/AsbCloudServer/pulls/289
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
This commit is contained in:
Никита Фролов 2024-07-23 15:35:58 +05:00
commit 1293194fee
46 changed files with 26368 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFDto.cs
View File

@ -17,5 +17,5 @@ public class ProcessMapPlanAutoHoldTFDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

2
AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanDamperDto.cs
View File

@ -17,5 +17,5 @@ public class ProcessMapPlanDamperDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

2
AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanDrillTestDto.cs
View File

@ -41,5 +41,5 @@ public class ProcessMapPlanDrillTestDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символа")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

2
AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanOscillationDto.cs
View File

@ -47,5 +47,5 @@ public class ProcessMapPlanOscillationDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

2
AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanShockTestDto.cs
View File

@ -47,5 +47,5 @@ public class ProcessMapPlanShockTestDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

4
AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanReamingRotorDto.cs
View File

@ -149,7 +149,7 @@ public class ProcessMapPlanReamingRotorDto : ProcessMapPlanBaseDto
/// Проработка 3, Количество повторений, шт.
/// </summary>
[Range(0, 99, ErrorMessage = "Проработка 3, Количество повторений, шт., должно быть в пределах от 0 до 99")]
public double Reaming3RepetitionsCount { get; set; }
public int Reaming3RepetitionsCount { get; set; }
/// <summary>
/// Проработка 3, Скорость, м/ч., Вверх
@ -203,5 +203,5 @@ public class ProcessMapPlanReamingRotorDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

8
AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanReamingSlideDto.cs
View File

@ -41,7 +41,7 @@ public class ProcessMapPlanReamingSlideDto : ProcessMapPlanBaseDto
/// Проработка 1, Количество повторений, шт.
/// </summary>
[Range(0.0, 99.0, ErrorMessage = "Проработка 1, Количество повторений, шт., должно быть в пределах от 0 до 99")]
public double Reaming1RepetitionsCount { get; set; }
public int Reaming1RepetitionsCount { get; set; }
/// <summary>
/// Проработка 1, Скорость, м/ч., Вверх
@ -95,7 +95,7 @@ public class ProcessMapPlanReamingSlideDto : ProcessMapPlanBaseDto
/// Проработка 2, Количество повторений, шт.
/// </summary>
[Range(0.0, 99.0, ErrorMessage = "Проработка 2, Количество повторений, шт., должно быть в пределах от 0 до 99")]
public double Reaming2RepetitionsCount { get; set; }
public int Reaming2RepetitionsCount { get; set; }
/// <summary>
/// Проработка 2, Скорость, м/ч., Вверх
@ -149,7 +149,7 @@ public class ProcessMapPlanReamingSlideDto : ProcessMapPlanBaseDto
/// Проработка 3, Количество повторений, шт.
/// </summary>
[Range(0.0, 99.0, ErrorMessage = "Проработка 3, Количество повторений, шт., должно быть в пределах от 0 до 99")]
public double Reaming3RepetitionsCount { get; set; }
public int? Reaming3RepetitionsCount { get; set; }
/// <summary>
/// Проработка 3, Скорость, м/ч., Вверх
@ -203,7 +203,7 @@ public class ProcessMapPlanReamingSlideDto : ProcessMapPlanBaseDto
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
}

12236
AsbCloudDb/Migrations/20240718044823_Update_Tables_ProcessMapOperationsAndFunctions2.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

1012
AsbCloudDb/Migrations/20240718044823_Update_Tables_ProcessMapOperationsAndFunctions2.cs Normal file
View File

File diff suppressed because it is too large Load Diff

12236
AsbCloudDb/Migrations/20240723055049_NotNullable_Fields_ProcessMapPlanReamingRotorAndSlide.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

810
AsbCloudDb/Migrations/20240723055049_NotNullable_Fields_ProcessMapPlanReamingRotorAndSlide.cs Normal file
View File

@ -0,0 +1,810 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
/// <inheritdoc />
public partial class NotNullable_Fields_ProcessMapPlanReamingRotorAndSlide : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<double>(
name: "reaming3_stop_point_off_bottom",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming3_repetitions_count",
table: "t_process_map_plan_reaming_slide",
type: "integer",
nullable: false,
defaultValue: 0,
comment: "Проработка 3, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true,
oldComment: "Проработка 3, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_interval",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Расход, л/с., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_stop_point_off_bottom",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming2_repetitions_count",
table: "t_process_map_plan_reaming_slide",
type: "integer",
nullable: false,
defaultValue: 0,
comment: "Проработка 2, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true,
oldComment: "Проработка 2, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_interval",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Расход, л/с., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming3_stop_point_off_bottom",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming3_repetitions_count",
table: "t_process_map_plan_operation_reaming_rotor",
type: "integer",
nullable: false,
defaultValue: 0,
comment: "Проработка 3, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true,
oldComment: "Проработка 3, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_interval",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 3, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 3, Расход, л/с., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_stop_point_off_bottom",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming2_repetitions_count",
table: "t_process_map_plan_operation_reaming_rotor",
type: "integer",
nullable: false,
defaultValue: 0,
comment: "Проработка 2, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true,
oldComment: "Проработка 2, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_interval",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: false,
defaultValue: 0.0,
comment: "Проработка 2, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldNullable: true,
oldComment: "Проработка 2, Расход, л/с., Вниз");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<double>(
name: "reaming3_stop_point_off_bottom",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming3_repetitions_count",
table: "t_process_map_plan_reaming_slide",
type: "integer",
nullable: true,
comment: "Проработка 3, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldComment: "Проработка 3, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_interval",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 3, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Расход, л/с., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_stop_point_off_bottom",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming2_repetitions_count",
table: "t_process_map_plan_reaming_slide",
type: "integer",
nullable: true,
comment: "Проработка 2, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldComment: "Проработка 2, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_interval",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_up",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_down",
table: "t_process_map_plan_reaming_slide",
type: "double precision",
nullable: true,
comment: "Проработка 2, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Расход, л/с., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming3_stop_point_off_bottom",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rpm_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_rop_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming3_repetitions_count",
table: "t_process_map_plan_operation_reaming_rotor",
type: "integer",
nullable: true,
comment: "Проработка 3, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldComment: "Проработка 3, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_interval",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming3_flow_rate_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 3, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 3, Расход, л/с., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_stop_point_off_bottom",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Остановка над забоем, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Остановка над забоем, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Обороты, об/мин., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Обороты, об/мин., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rpm_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Обороты, об/мин., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Обороты, об/мин., Вниз");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Скорость, м/ч., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Скорость, м/ч., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_rop_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Скорость, м/ч., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Скорость, м/ч., Вниз");
migrationBuilder.AlterColumn<int>(
name: "reaming2_repetitions_count",
table: "t_process_map_plan_operation_reaming_rotor",
type: "integer",
nullable: true,
comment: "Проработка 2, Количество повторений, шт.",
oldClrType: typeof(int),
oldType: "integer",
oldComment: "Проработка 2, Количество повторений, шт.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_interval",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Интервал проработки, м.",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Интервал проработки, м.");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_up",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Расход, л/с., Вверх",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Расход, л/с., Вверх");
migrationBuilder.AlterColumn<double>(
name: "reaming2_flow_rate_down",
table: "t_process_map_plan_operation_reaming_rotor",
type: "double precision",
nullable: true,
comment: "Проработка 2, Расход, л/с., Вниз",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Проработка 2, Расход, л/с., Вниз");
}
}
}

21
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -1,4 +1,4 @@
// <auto-generated />
// <auto-generated />
using System;
using System.Text.Json;
using AsbCloudDb.Model;
@ -2785,7 +2785,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Тип секции");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -2875,7 +2874,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Тип секции");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -2970,7 +2968,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Величина проходки шага, м.");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -3080,7 +3077,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Режим Авто/Руч");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -3200,7 +3196,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Тип секции");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -3750,7 +3745,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Тип секции");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -3995,7 +3989,6 @@ namespace AsbCloudDb.Migrations
.HasComment("Тип секции");
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)")
.HasColumnName("note")
@ -4026,8 +4019,8 @@ namespace AsbCloudDb.Migrations
.HasColumnName("reaming1_interval")
.HasComment("Проработка 1, Интервал проработки, м.");
b.Property<double>("Reaming1RepetitionsCount")
.HasColumnType("double precision")
b.Property<int>("Reaming1RepetitionsCount")
.HasColumnType("integer")
.HasColumnName("reaming1_repetitions_count")
.HasComment("Проработка 1. Количество повторений, шт.");
@ -4071,8 +4064,8 @@ namespace AsbCloudDb.Migrations
.HasColumnName("reaming2_interval")
.HasComment("Проработка 2, Интервал проработки, м.");
b.Property<double>("Reaming2RepetitionsCount")
.HasColumnType("double precision")
b.Property<int>("Reaming2RepetitionsCount")
.HasColumnType("integer")
.HasColumnName("reaming2_repetitions_count")
.HasComment("Проработка 2, Количество повторений, шт.");
@ -4116,8 +4109,8 @@ namespace AsbCloudDb.Migrations
.HasColumnName("reaming3_interval")
.HasComment("Проработка 3, Интервал проработки, м.");
b.Property<double>("Reaming3RepetitionsCount")
.HasColumnType("double precision")
b.Property<int>("Reaming3RepetitionsCount")
.HasColumnType("integer")
.HasColumnName("reaming3_repetitions_count")
.HasComment("Проработка 3, Количество повторений, шт.");

2
AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTF.cs
View File

@ -14,7 +14,7 @@ public class ProcessMapPlanAutoHoldTF : ProcessMapPlanBase
public double ZenithAngle { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanAutoHoldTF? Previous { get; set; }

2
AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDamper.cs
View File

@ -14,7 +14,7 @@ public class ProcessMapPlanDamper : ProcessMapPlanBase
public double StickSlip { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanDamper? Previous { get; set; }

2
AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDrillTest.cs
View File

@ -34,7 +34,7 @@ public class ProcessMapPlanDrillTest : ProcessMapPlanBase
public double LengthStep { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanDrillTest? Previous { get; set; }

2
AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanOscillation.cs
View File

@ -39,7 +39,7 @@ public class ProcessMapPlanOscillation : ProcessMapPlanBase
public int Mode { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanOscillation? Previous { get; set; }

2
AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanShockTest.cs
View File

@ -39,7 +39,7 @@ public class ProcessMapPlanShockTest : ProcessMapPlanBase
public double RpmMin { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanShockTest? Previous { get; set; }

20
AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingRotor.cs
View File

@ -80,78 +80,96 @@ public class ProcessMapPlanReamingRotor : ProcessMapPlanBase
[Column("reaming2_repetitions_count"), Comment("Проработка 2, Количество повторений, шт.")]
[Range(0, 99)]
[Required]
public int Reaming2RepetitionsCount { get; set; }
[Column("reaming2_rop_up"), Comment("Проработка 2, Скорость, м/ч., Вверх")]
[Range(0.0, 999.0)]
[Required]
public double Reaming2RopUp { get; set; }
[Column("reaming2_rop_down"), Comment("Проработка 2, Скорость, м/ч., Вниз")]
[Range(0.0, 999.0)]
[Required]
public double Reaming2RopDown { get; set; }
[Column("reaming2_rpm_up"), Comment("Проработка 2, Обороты, об/мин., Вверх")]
[Range(0.0, 270.0)]
[Required]
public double Reaming2RpmUp { get; set; }
[Column("reaming2_rpm_down"), Comment("Проработка 2, Обороты, об/мин., Вниз")]
[Range(0.0, 270.0)]
[Required]
public double Reaming2RpmDown { get; set; }
[Column("reaming2_flow_rate_up"), Comment("Проработка 2, Расход, л/с., Вверх")]
[Range(0.0, 100.0)]
[Required]
public double Reaming2FlowRateUp { get; set; }
[Column("reaming2_flow_rate_down"), Comment("Проработка 2, Расход, л/с., Вниз")]
[Range(0.0, 100.0)]
[Required]
public double Reaming2FlowRateDown { get; set; }
[Column("reaming2_interval"), Comment("Проработка 2, Интервал проработки, м.")]
[Range(0.0, 30.0)]
[Required]
public double Reaming2Interval { get; set; }
[Column("reaming2_stop_point_off_bottom"), Comment("Остановка над забоем, м.")]
[Range(0.0, 10.0)]
[Required]
public double Reaming2StopPointOffBottom { get; set; }
[Column("reaming3_repetitions_count"), Comment("Проработка 3, Количество повторений, шт.")]
[Range(0, 99)]
[Required]
public int Reaming3RepetitionsCount { get; set; }
[Column("reaming3_rop_up"), Comment("Проработка 3, Скорость, м/ч., Вверх")]
[Range(0.0, 999.0)]
[Required]
public double Reaming3RopUp { get; set; }
[Column("reaming3_rop_down"), Comment("Проработка 3, Скорость, м/ч., Вниз")]
[Range(0.0, 999.0)]
[Required]
public double Reaming3RopDown { get; set; }
[Column("reaming3_rpm_up"), Comment("Проработка 3, Обороты, об/мин., Вверх")]
[Range(0.0, 270.0)]
[Required]
public double Reaming3RpmUp { get; set; }
[Column("reaming3_rpm_down"), Comment("Проработка 3, Обороты, об/мин., Вниз")]
[Range(0.0, 270.0)]
[Required]
public double Reaming3RpmDown { get; set; }
[Column("reaming3_flow_rate_up"), Comment("Проработка 3, Расход, л/с., Вверх")]
[Range(0.0, 100.0)]
[Required]
public double Reaming3FlowRateUp { get; set; }
[Column("reaming3_flow_rate_down"), Comment("Проработка 3, Расход, л/с., Вниз")]
[Range(0.0, 100.0)]
[Required]
public double Reaming3FlowRateDown { get; set; }
[Column("reaming3_interval"), Comment("Проработка 3, Интервал проработки, м.")]
[Range(0.0, 30.0)]
[Required]
public double Reaming3Interval { get; set; }
[Column("reaming3_stop_point_off_bottom"), Comment("Остановка над забоем, м.")]
[Range(0.0, 10.0)]
[Required]
public double Reaming3StopPointOffBottom { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanReamingRotor? Previous { get; set; }

26
AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingSlide.cs
View File

@ -36,7 +36,7 @@ public class ProcessMapPlanReamingSlide : ProcessMapPlanBase
[Column("reaming1_repetitions_count"), Comment("Проработка 1. Количество повторений, шт.")]
[Range(0.0, 99.0)]
[Required]
public double Reaming1RepetitionsCount { get; set; }
public int Reaming1RepetitionsCount { get; set; }
[Column("reaming1_rop_up"), Comment("Проработка 1. Скорость вверх, м/ч.")]
[Range(0.0, 999.0)]
@ -80,78 +80,96 @@ public class ProcessMapPlanReamingSlide : ProcessMapPlanBase
[Column("reaming2_repetitions_count"), Comment("Проработка 2, Количество повторений, шт.")]
[Range(0.0, 99.0)]
public double Reaming2RepetitionsCount { get; set; }
[Required]
public int Reaming2RepetitionsCount { get; set; }
[Column("reaming2_rop_up"), Comment("Проработка 2, Скорость, м/ч., Вверх")]
[Range(0.0, 999.0)]
[Required]
public double Reaming2RopUp { get; set; }
[Column("reaming2_rop_down"), Comment("Проработка 2, Скорость, м/ч., Вниз")]
[Range(0.0, 999.0)]
[Required]
public double Reaming2RopDown { get; set; }
[Column("reaming2_rpm_up"), Comment("Проработка 2, Обороты, об/мин., Вверх")]
[Range(0.0, 270.0)]
[Required]
public double Reaming2RpmUp { get; set; }
[Column("reaming2_rpm_down"), Comment("Проработка 2, Обороты, об/мин., Вниз")]
[Range(0.0, 270.0)]
[Required]
public double Reaming2RpmDown { get; set; }
[Column("reaming2_flow_rate_up"), Comment("Проработка 2, Расход, л/с., Вверх")]
[Range(0.0, 100.0)]
[Required]
public double Reaming2FlowRateUp { get; set; }
[Column("reaming2_flow_rate_down"), Comment("Проработка 2, Расход, л/с., Вниз")]
[Range(0.0, 100.0)]
[Required]
public double Reaming2FlowRateDown { get; set; }
[Column("reaming2_interval"), Comment("Проработка 2, Интервал проработки, м.")]
[Range(0.0, 30.0)]
[Required]
public double Reaming2Interval { get; set; }
[Column("reaming2_stop_point_off_bottom"), Comment("Остановка над забоем, м.")]
[Range(0.0, 10.0)]
[Required]
public double Reaming2StopPointOffBottom { get; set; }
[Column("reaming3_repetitions_count"), Comment("Проработка 3, Количество повторений, шт.")]
[Range(0.0, 99.0)]
public double Reaming3RepetitionsCount { get; set; }
[Required]
public int Reaming3RepetitionsCount { get; set; }
[Column("reaming3_rop_up"), Comment("Проработка 3, Скорость, м/ч., Вверх")]
[Range(0.0, 999.0)]
[Required]
public double Reaming3RopUp { get; set; }
[Column("reaming3_rop_down"), Comment("Проработка 3, Скорость, м/ч., Вниз")]
[Range(0.0, 999.0)]
[Required]
public double Reaming3RopDown { get; set; }
[Column("reaming3_rpm_up"), Comment("Проработка 3, Обороты, об/мин., Вверх")]
[Range(0.0, 270.0)]
[Required]
public double Reaming3RpmUp { get; set; }
[Column("reaming3_rpm_down"), Comment("Проработка 3, Обороты, об/мин., Вниз")]
[Range(0.0, 270.0)]
[Required]
public double Reaming3RpmDown { get; set; }
[Column("reaming3_flow_rate_up"), Comment("Проработка 3, Расход, л/с., Вверх")]
[Range(0.0, 100.0)]
[Required]
public double Reaming3FlowRateUp { get; set; }
[Column("reaming3_flow_rate_down"), Comment("Проработка 3, Расход, л/с., Вниз")]
[Range(0.0, 100.0)]
[Required]
public double Reaming3FlowRateDown { get; set; }
[Column("reaming3_interval"), Comment("Проработка 3, Интервал проработки, м.")]
[Range(0.0, 30.0)]
[Required]
public double Reaming3Interval { get; set; }
[Column("reaming3_stop_point_off_bottom"), Comment("Остановка над забоем, м.")]
[Range(0.0, 10.0)]
[Required]
public double Reaming3StopPointOffBottom { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
public string? Note { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanReamingSlide? Previous { get; set; }

4
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanAntiCrashRotationTemplate.cs
View File

@ -8,9 +8,9 @@ public class ProcessMapPlanAntiCrashRotationTemplate : ITemplateParameters
{
public string SheetName => "Противоаварийное вращение";
public int HeaderRowsCount => 3;
public int HeaderRowsCount => 2;
public string FileName => "ProcessMapPlanAntiCrashRotation.xlsx";
public string FileName => "ProcessMapPlanAnticrashRotation.xlsx";
public IDictionary<string, Cell> Cells => new Dictionary<string, Cell>
{

2
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDrillTestTemplate.cs
View File

@ -5,7 +5,7 @@ namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlan
public class ProcessMapPlanDrillTestTemplate : ITemplateParameters
{
public string SheetName => "Дрилтест";
public string SheetName => "DrillTest";
public int HeaderRowsCount => 2;

6
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamingRotorTemplate.cs
View File

@ -6,9 +6,9 @@ namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlan
public class ProcessMapPlanReamingRotorTemplate : ITemplateParameters
{
public string SheetName => "Проработка ротор";
public string SheetName => "Проработка для ротора";
public int HeaderRowsCount => 2;
public int HeaderRowsCount => 3;
public string FileName => "ProcessMapPlanReamingRotor.xlsx";
@ -42,7 +42,7 @@ public class ProcessMapPlanReamingRotorTemplate : ITemplateParameters
{ nameof(ProcessMapPlanReamingRotorDto.Reaming2StopPointOffBottom), new Cell(26, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming3RepetitionsCount), new Cell(27, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming3RopUp), new Cell(28, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming1RopDown), new Cell(29, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming3RopDown), new Cell(29, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming3RpmUp), new Cell(30, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming3RpmDown), new Cell(31, typeof(double)) },
{ nameof(ProcessMapPlanReamingRotorDto.Reaming3FlowRateUp), new Cell(32, typeof(double)) },

4
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamingSlideTemplate.cs
View File

@ -5,7 +5,7 @@ namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlan
public class ProcessMapPlanReamingSlideTemplate : ITemplateParameters
{
public string SheetName => "Проработка слайд";
public string SheetName => "Проработка для слайда";
public int HeaderRowsCount => 2;
@ -41,7 +41,7 @@ public class ProcessMapPlanReamingSlideTemplate : ITemplateParameters
{ nameof(ProcessMapPlanReamingSlideDto.Reaming2StopPointOffBottom), new Cell(26, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming3RepetitionsCount), new Cell(27, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming3RopUp), new Cell(28, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming1RopDown), new Cell(29, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming3RopDown), new Cell(29, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming3RpmUp), new Cell(30, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming3RpmDown), new Cell(31, typeof(double)) },
{ nameof(ProcessMapPlanReamingSlideDto.Reaming3FlowRateUp), new Cell(32, typeof(double)) },

2
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorTemplate.cs
View File

@ -28,6 +28,6 @@ public class ProcessMapPlanRotorTemplate : ITemplateParameters
{ nameof(ProcessMapPlanRotorDto.RpmMax), new Cell(13, typeof(double)) },
{ nameof(ProcessMapPlanRotorDto.FlowRate), new Cell(14, typeof(double)) },
{ nameof(ProcessMapPlanRotorDto.FlowRateMax), new Cell(15, typeof(double)) },
{ nameof(ProcessMapPlanRotorDto.Note), new Cell(16, typeof(double)) },
{ nameof(ProcessMapPlanRotorDto.Note), new Cell(16, typeof(string)) },
};
}

2
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanShockTestTemplate.cs
View File

@ -5,7 +5,7 @@ namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlan
public class ProcessMapPlanShockTestTemplate : ITemplateParameters
{
public string SheetName => "Запись shock test";
public string SheetName => "ShockTest";
public int HeaderRowsCount => 2;

2
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingOffThePumpTemplate.cs
View File

@ -17,10 +17,8 @@ public class ProcessMapPlanSwitchingOffThePumpTemplate : ITemplateParameters
{ nameof(ProcessMapPlanSwitchingOffThePumpDto.Section), new Cell(1, typeof(string)) },
{ nameof(ProcessMapPlanSwitchingOffThePumpDto.DepthStart), new Cell(2, typeof(double)) },
{ nameof(ProcessMapPlanSwitchingOffThePumpDto.DepthEnd), new Cell(3, typeof(double)) },
{ nameof(ProcessMapPlanSwitchingOffThePumpDto.Duration), new Cell(4, typeof(double)) },
{ nameof(ProcessMapPlanSwitchingOffThePumpDto.ResidualPressureLimit), new Cell(5, typeof(double)) },
{ nameof(ProcessMapPlanSwitchingOffThePumpDto.Note), new Cell(6, typeof(string)) },
};
}

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanAnticrashRotation.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanAutoHoldTF.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanDamper.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanDrillTest.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanLoadCapacity.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanOscillation.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanOscillationAngles.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanPositioningOffTheBottom.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanReamingRotor.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanReamingSlide.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanRecordingStaticMeasurement.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanRotor.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanShockTest.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanSlide.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanStaticMeasurementOutput.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanSwitchingOffThePump.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanSwitchingToTheMode.xlsx
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanTFOrientation.xlsx
View File

Binary file not shown.

69
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs
View File

@ -1,69 +0,0 @@
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
using AsbCloudWebApi.IntegrationTests;
using Microsoft.EntityFrameworkCore;
using Xunit;
using AsbCloudDb.Model.ProcessMapPlan.Functions;
using AsbCloudApp.Data.ProcessMaps.Functions;
namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Functions;
/// <summary>
/// РТК план обновление холостого хода
/// </summary>
public class ProcessMapPlanUpdatingNoloadParametersControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanUpdatingNoloadParameters, ProcessMapPlanUpdatingNoloadParametersDto>
{
public ProcessMapPlanUpdatingNoloadParametersControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanUpdatingNoloadParameters")
{
}
private readonly ProcessMapPlanUpdatingNoloadParametersDto dto = new ProcessMapPlanUpdatingNoloadParametersDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
IdDeclineSocketColumn = true,
Note = "1",
};
private readonly ProcessMapPlanUpdatingNoloadParameters entity = new ProcessMapPlanUpdatingNoloadParameters()
{
IdWell = 1,
DepthEnd = 10,
DepthStart = 2,
Id = 0,
IdWellSectionType = 1,
IdAuthor = 1,
IdEditor = 1,
Creation = DateTimeOffset.UtcNow,
IdDeclineSocketColumn = true,
Note = "1"
};
[Fact]
public async Task Get_actual_returns_success()
{
await Get(entity, dto);
}
protected override ProcessMapPlanUpdatingNoloadParameters GetByNote(DbSet<ProcessMapPlanUpdatingNoloadParameters> dbSet, ProcessMapPlanUpdatingNoloadParametersDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanUpdatingNoloadParametersDto GetByNote(IEnumerable<ProcessMapPlanUpdatingNoloadParametersDto> dtos, ProcessMapPlanUpdatingNoloadParametersDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanUpdatingNoloadParameters? GetByWellId()
{
throw new NotImplementedException();
}
}

68
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs
View File

@ -1,68 +0,0 @@
using AsbCloudApp.Data.ProcessMaps.Operations;
using AsbCloudDb.Model.ProcessMapPlan.Operations;
using Microsoft.EntityFrameworkCore;
using Xunit;
namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
/// <summary>
/// РТК план встряхивание бурового инструмента
/// </summary>
public class ProcessMapPlanRotorRpmAccelerationControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanRotorRpmAcceleration, ProcessMapPlanRotorRpmAccelerationDto>
{
public ProcessMapPlanRotorRpmAccelerationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanRotorRpmAcceleration")
{
}
private readonly ProcessMapPlanRotorRpmAccelerationDto dto = new ProcessMapPlanRotorRpmAccelerationDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
Note = "1",
Rpm = 1,
RpmMax = 2,
TopDriveTorque = 2,
TopDriveTorqueMax = 3,
};
private readonly ProcessMapPlanRotorRpmAcceleration entity = new ProcessMapPlanRotorRpmAcceleration()
{
IdWell = 1,
DepthEnd = 10,
DepthStart = 2,
Id = 0,
IdWellSectionType = 1,
IdAuthor = 1,
IdEditor = 1,
Creation = DateTimeOffset.UtcNow,
Note = "1",
Rpm = 1,
RpmMax = 2,
TopDriveTorque = 2,
TopDriveTorqueMax = 3,
};
[Fact]
public async Task Get_actual_returns_success()
{
await Get(entity, dto);
}
protected override ProcessMapPlanRotorRpmAcceleration GetByNote(DbSet<ProcessMapPlanRotorRpmAcceleration> dbSet, ProcessMapPlanRotorRpmAccelerationDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanRotorRpmAccelerationDto GetByNote(IEnumerable<ProcessMapPlanRotorRpmAccelerationDto> dtos, ProcessMapPlanRotorRpmAccelerationDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanRotorRpmAcceleration? GetByWellId()
{
throw new NotImplementedException();
}
}