From d70cf25c0a399f018a0730904c1d16e405bdcdb7 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Mon, 6 Feb 2023 13:13:23 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B6=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=BE=D1=82=D1=87=D0=B5=D1=82?= =?UTF-8?q?=D0=B0=20=D0=A0=D0=A2=D0=9A=20=D0=BA=20=D0=B0=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC=D1=83=20=D1=81=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8E=20(=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=BA,=20=D1=87=D0=B0=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D1=87=D0=BD=D0=BE=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=88=D0=B0=D0=BF=D0=BA=D0=B0=20=D0=BE=D1=82=D1=87?= =?UTF-8?q?=D0=B5=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessMap/ProcessMapReportService.cs | 35 ++++++++++++------ .../ProcessMap/ProcessMapReportTemplate.xlsx | Bin 6007 -> 7570 bytes 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs index da7f3f79..2fe5b180 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs @@ -13,9 +13,9 @@ namespace AsbCloudInfrastructure.Services.ProcessMap public class ProcessMapReportService : IProcessMapReportService { const int firstColumn = 2; - const int lastColumn = 27; + const int lastColumn = 30; - const int headerRowsCount = 3; + const int headerRowsCount = 8; private readonly IProcessMapService processMapService; @@ -68,7 +68,9 @@ namespace AsbCloudInfrastructure.Services.ProcessMap sheet.Range(row, firstColumn, row, lastColumn) .Merge() .FirstCell() - .SetVal(sectionName); + .SetVal(sectionName) + .Style + .Fill.SetBackgroundColor(XLColor.LightGray); row++; @@ -82,14 +84,17 @@ namespace AsbCloudInfrastructure.Services.ProcessMap private static int FillIntervalData(IXLWorksheet sheet, ProcessMapReportDto interval, int row) { - const int columnDepth = firstColumn; - const int columnDate = firstColumn + 1; - const int columnRopTime = firstColumn + 2; - const int columnMode = firstColumn + 3; + const int columnDepth = firstColumn + 1; + const int columnDate = firstColumn + 2; + const int columnRopTime = firstColumn + 3; + const int columnMode = firstColumn + 4; int rowRotor = row; int rowSlide = row + 1; + sheet.Range(rowRotor, firstColumn, rowSlide, firstColumn) + .Merge(); + sheet.Range(rowRotor, columnDepth, rowSlide, columnDepth) .Merge().FirstCell() .SetVal(interval.DepthStart, "0.0"); @@ -115,8 +120,9 @@ namespace AsbCloudInfrastructure.Services.ProcessMap int columnLoad = columnPressure + 5; int columnTorque = columnLoad + 5; int columnSpeed = columnTorque + 5; - int columnUsage = columnSpeed + 4; - int columnRop = columnUsage + 1; + int columnUsagePlan = columnSpeed + 5; + int columnUsageFact = columnUsagePlan + 1; + int columnRop = columnUsageFact + 1; sheet.Cell(row, column) .SetVal(modeName); @@ -129,7 +135,10 @@ namespace AsbCloudInfrastructure.Services.ProcessMap FillIntervalModeDataParam(sheet, modeData.TopDriveTorque, columnTorque, row); FillIntervalModeDataSpeed(sheet, modeData.SpeedLimit, columnSpeed, row); - sheet.Cell(row, columnUsage) + sheet.Cell(row, columnUsagePlan) + .SetVal(100); + + sheet.Cell(row, columnUsageFact) .SetVal(modeData.Usage); sheet.Cell(row, columnRop) @@ -167,7 +176,8 @@ namespace AsbCloudInfrastructure.Services.ProcessMap const int columnOffsetSpPlan = 0; const int columnOffsetSpFact = 1; const int columnOffsetFact = 2; - const int columnOffsetPercent = 3; + const int columnOffsetLimit = 3; + const int columnOffsetPercent = 4; sheet.Cell(row, column + columnOffsetSpPlan) .SetVal(dataParam.SetpointPlan); @@ -178,6 +188,9 @@ namespace AsbCloudInfrastructure.Services.ProcessMap sheet.Cell(row, column + columnOffsetFact) .SetVal(dataParam.Fact); + sheet.Cell(row, column + columnOffsetLimit) + .SetVal(dataParam.Limit); + sheet.Cell(row, column + columnOffsetPercent) .SetVal(dataParam.PercDrillingSetpoint); } diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportTemplate.xlsx b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportTemplate.xlsx index 64b328cd82d6f571285c9a726b2ff39661bfb0a3..e716a80835311240d6ee20fc8812d0c03eb330eb 100644 GIT binary patch delta 5847 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 delta 4285 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 Bm7f3r