diff --git a/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs index 5866d057..7a3a690a 100644 --- a/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs +++ b/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs @@ -22,6 +22,11 @@ public class SubsystemBlockDto : ItemInfoDto /// Общая плановая мех. скорость /// public double? TotalRopPlan { get; set; } + + /// + /// Отклонение по ГГД, сут + /// + public double? TvgLagDays { get; set; } /// /// Рекомендации специалиста diff --git a/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs b/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs index c63afc0f..f8d61168 100644 --- a/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs +++ b/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs @@ -7,6 +7,8 @@ public class SubsystemBlock : ItemInfo public double? WellBore { get; set; } public double? MeasurementsPerDay { get; set; } + + public double? TvgLagDays { get; set; } public double? TotalRopPlan { get; set; } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs index 53bb24f3..ed47cc02 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs @@ -74,12 +74,13 @@ public class DailyReportExportService : IDailyReportExportService private const string cellTimeBalanceBlockWellOperationSlipsTimeCount = "F79"; private const string cellSubsystemComment = "D35"; - private const string cellSubsystemMeasurementsPerDay = "F80"; + private const string cellSubsystemTvgLagDays = "F80"; + private const string cellSubsystemMeasurementsPerDay = "F81"; private const string cellSubsystemWellBore = "C9"; private const string cellSubsystemTotalRopPlan = "E70"; - private const string cellSignDrillingMaster = "C84"; - private const string cellSignSupervisor = "C85"; + private const string cellSignDrillingMaster = "C85"; + private const string cellSignSupervisor = "C86"; private readonly IDailyReportService dailyReportService; @@ -202,6 +203,7 @@ public class DailyReportExportService : IDailyReportExportService } sheet.Cell(cellSubsystemComment).Value = subsystemBlock.Comment; + sheet.Cell(cellSubsystemTvgLagDays).Value = subsystemBlock.TvgLagDays; sheet.Cell(cellSubsystemMeasurementsPerDay).Value = subsystemBlock.MeasurementsPerDay; sheet.Cell(cellSubsystemWellBore).Value = subsystemBlock.WellBore; sheet.Cell(cellSubsystemTotalRopPlan).Value = subsystemBlock.TotalRopPlan; diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportTemplate.xlsx b/AsbCloudInfrastructure/Services/DailyReport/DailyReportTemplate.xlsx index 7594507c..38d1bdba 100644 Binary files a/AsbCloudInfrastructure/Services/DailyReport/DailyReportTemplate.xlsx and b/AsbCloudInfrastructure/Services/DailyReport/DailyReportTemplate.xlsx differ