diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs index 65ef2307..66d5b018 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs @@ -75,7 +75,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet.Cell(AddressDurationDataFinish[0]) ._SetValue($"{blockDto.ExtensionDrillingOneFinish}"); sheet.Cell(AddressTotaData[0]) - .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[0], AddressDurationDataFinish[0])}"); + .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[0], AddressDurationDataFinish[0])}").Style.SetAllBorders(); sheet._Range(AddressOperationData[1], AddressOperationData[1] + (0, 4)) ._SetValue("Промывка."); sheet.Cell(AddressDurationDataStart[1]) @@ -83,7 +83,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet.Cell(AddressDurationDataFinish[1]) ._SetValue($"{blockDto.SluiceBegin}"); sheet.Cell(AddressTotaData[1]) - .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[1], AddressDurationDataFinish[1])}"); + .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[1], AddressDurationDataFinish[1])}").Style.SetAllBorders(); sheet._Range(AddressOperationData[2], AddressOperationData[2] + (0, 4)) ._SetValue("Подъем КНБК в инт. 2763-2442м."); sheet.Cell(AddressDurationDataStart[2]) @@ -91,7 +91,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet.Cell(AddressDurationDataFinish[2]) ._SetValue($"{blockDto.ClimbFinish}"); sheet.Cell(AddressTotaData[2]) - .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[2], AddressDurationDataFinish[2])}"); + .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[2], AddressDurationDataFinish[2])}").Style.SetAllBorders(); sheet._Range(AddressOperationData[3], AddressOperationData[3] + (0, 4)) ._SetValue("Спуск КНБК в инт. 2442-2763м."); sheet.Cell(AddressDurationDataStart[3]) @@ -99,7 +99,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet.Cell(AddressDurationDataFinish[3]) ._SetValue($"{blockDto.DescentFinish}"); sheet.Cell(AddressTotaData[3]) - .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[3], AddressDurationDataFinish[3])}"); + .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[3], AddressDurationDataFinish[3])}").Style.SetAllBorders(); sheet._Range(AddressOperationData[4], AddressOperationData[4] + (0, 4)) ._SetValue("Бурение с наращиваниями в инт. 2763-2850м."); sheet.Cell(AddressDurationDataStart[4]) @@ -107,7 +107,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet.Cell(AddressDurationDataFinish[4]) ._SetValue($"{blockDto.ExtensionDrillingTwoFinish}"); sheet.Cell(AddressTotaData[4]) - .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[4], AddressDurationDataFinish[4])}"); + .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[4], AddressDurationDataFinish[4])}").Style.SetAllBorders(); } } } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs index 4c3b4cfc..e1c5a7bb 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs @@ -57,7 +57,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks private string FormulaBlockPlan(CellAddress cellTarget) { - return $"={cellTarget}/60*{SaubBlock.ExtensionsCountValue}"; + return $"={cellTarget}/60*{SaubBlock.AddressExtensionsCountValue}"; } private string FormulaBlockExcess(CellAddress cellFact, CellAddress cellPlan) @@ -81,7 +81,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet._Range(AddressPreparationHead[1], AddressPreparationHead[1] + (0, 1)) ._SetValue("Проработка при бур, план (ч):"); sheet.Cell(AddressPreparationValue[1]) - .SetFormulaA1($"{FormulaBlockPlan(AddressPreparationValue[0])}"); + .SetFormulaA1($"{FormulaBlockPlan(AddressPreparationValue[0])}").Style.SetAllBorders(); sheet._Range(AddressPreparationHead[2], AddressPreparationHead[2] + (0, 1)) ._SetValue("Проработка при бур, факт (ч):"); sheet.Cell(AddressPreparationValue[2]) @@ -89,7 +89,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet._Range(AddressPreparationHead[3], AddressPreparationHead[3] + (0, 1)) ._SetValue("Превышение плановых норм, (ч):"); sheet.Cell(AddressPreparationValue[3]) - .SetFormulaA1($"{FormulaBlockExcess(AddressPreparationValue[2], AddressPreparationValue[1])}"); + .SetFormulaA1($"{FormulaBlockExcess(AddressPreparationValue[2], AddressPreparationValue[1])}").Style.SetAllBorders(); sheet._Range(AddressExtensionHead[0], AddressExtensionHead[0] + (0, 1)) ._SetValue("Норматив на одну операцию, (мин):"); sheet.Cell(AddressExtensionValue[0]) @@ -97,7 +97,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet._Range(AddressExtensionHead[1], AddressExtensionHead[1] + (0, 1)) ._SetValue("Наращивание, план (ч):"); sheet.Cell(AddressExtensionValue[1]) - .SetFormulaA1($"{FormulaBlockPlan(AddressExtensionValue[0])}"); + .SetFormulaA1($"{FormulaBlockPlan(AddressExtensionValue[0])}").Style.SetAllBorders(); sheet._Range(AddressExtensionHead[2], AddressExtensionHead[2] + (0, 1)) ._SetValue("Наращивание, факт (ч):"); sheet.Cell(AddressExtensionValue[2]) @@ -105,7 +105,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet._Range(AddressExtensionHead[3], AddressExtensionHead[3] + (0, 1)) ._SetValue("Превышение плановых норм, (ч):"); sheet.Cell(AddressExtensionValue[3]) - .SetFormulaA1($"{FormulaBlockExcess(AddressExtensionValue[2], AddressExtensionValue[1])}"); + .SetFormulaA1($"{FormulaBlockExcess(AddressExtensionValue[2], AddressExtensionValue[1])}").Style.SetAllBorders(); sheet._Range(AddressPreparationDescription, AddressPreparationDescription + (1, 2)) ._SetValue("Подготовка ствола скв. к наращиванию"); sheet._Range(AddressExtensionDescription, AddressExtensionDescription + (1, 2)) diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs index 7494db18..f32f9435 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs @@ -26,7 +26,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks public CellAddress MspSection { get; } public CellAddress SectionDrillingTimeTotal { get; } public CellAddress SectionPenetrationTotal { get; } - public CellAddress ExtensionsCount { get; } + public CellAddress AddressExtensionsCount { get; } public CellAddress DeviationFromTVD { get; } public CellAddress DeclinesReasonsROP { get; } public CellAddress IncreaseSpeedSectionValue { get; } @@ -36,7 +36,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks public CellAddress MspSectionValue { get; } public CellAddress SectionDrillingTimeTotalValue { get; } public CellAddress SectionPenetrationTotalValue { get; } - public CellAddress ExtensionsCountValue { get; } + public CellAddress AddressExtensionsCountValue { get; } public CellAddress DeviationFromTVDValue { get; } public override CellAddress AddressBlockBegin { get; } public override CellAddress AddressBlockEnd { get; } @@ -94,8 +94,8 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks SectionDrillingTimeTotalValue = addressBlockBegin + (21, 4); SectionPenetrationTotal = addressBlockBegin + (22, 0); SectionPenetrationTotalValue = addressBlockBegin + (22, 4); - ExtensionsCount = addressBlockBegin + (23, 0); - ExtensionsCountValue = addressBlockBegin + (23, 4); + AddressExtensionsCount = addressBlockBegin + (23, 0); + AddressExtensionsCountValue = addressBlockBegin + (23, 4); DeviationFromTVD = addressBlockBegin + (24, 0); DeviationFromTVDValue = addressBlockBegin + (24, 4); DeclinesReasonsROP = addressBlockBegin + (25, 0); @@ -136,7 +136,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks ._SetValue($"{blockDto.NumberDrillingHours}"); sheet._Range(AddressDrillingTableData[2], AddressDrillingTableData[2] + (0, 1)); sheet.Cell(AddressDrillingTableData[2]) - .SetFormulaA1(FormulaMechanicalSpeed(AddressDrillingTableData[0], AddressDrillingTableData[1])); + .SetFormulaA1(FormulaMechanicalSpeed(AddressDrillingTableData[0], AddressDrillingTableData[1])).Style.SetAllBorders(); sheet._Range(AddressDrillingTableData[3], AddressDrillingTableData[3] + (0, 1)) ._SetValue($"{blockDto.AVGDiffDropRotor}"); sheet._Range(AddressSlideTableTitle, AddressSlideTableTitle + (0, 7)) @@ -155,7 +155,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks ._SetValue($"{blockDto.DrillingTimeInRotor}"); sheet._Range(AddressSlideTableData[2], AddressSlideTableData[2] + (0, 1)); sheet.Cell(AddressSlideTableData[2]) - .SetFormulaA1(FormulaMechanicalSpeed(AddressSlideTableData[0], AddressSlideTableData[1])); + .SetFormulaA1(FormulaMechanicalSpeed(AddressSlideTableData[0], AddressSlideTableData[1])).Style.SetAllBorders(); sheet._Range(AddressSlideTableData[3], AddressSlideTableData[3] + (0, 1)) ._SetValue($"{blockDto.AVGDiffPressureSlide}"); sheet._Range(AddressTotalTableTitle, AddressTotalTableTitle + (0, 5)) @@ -172,10 +172,10 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks AddressDrillingTableData[1].ToString(), AddressSlideTableData[1].ToString()); sheet._Range(AddressTotalTableData[0], AddressTotalTableData[0] + (0, 1)); sheet.Cell(AddressTotalTableData[0]) - .SetFormulaA1(formulaWatch); + .SetFormulaA1(formulaWatch).Style.SetAllBorders(); sheet._Range(AddressTotalTableData[1], AddressTotalTableData[1] + (0, 1)); sheet.Cell(AddressTotalTableData[1]) - .SetFormulaA1(formulaWatch); + .SetFormulaA1(formulaWatch).Style.SetAllBorders(); sheet._Range(AddressTotalTableData[2], AddressTotalTableData[2] + (0, 1)) ._SetValue(""); sheet._Range(AddressTotalTableData[3], AddressTotalTableData[3] + (0, 1))