From a5ccd8973d10d80911390695829db36cd0d10b05 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 26 Jul 2024 12:29:07 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessMapPlanLoadCapacityTemplate.cs | 3 +-- .../ProcessMapPlanOscillationTemplate.cs | 4 ++-- .../ProcessMapPlanReamingSlideTemplate.cs | 2 +- .../ProcessMapPlanSwitchingToTheModeTemplate.cs | 2 +- .../Operations/ProcessMapPlanLoadCapacityController.cs | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs index e70136a0..da574b8a 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanLoadCapacityTemplate.cs @@ -1,4 +1,3 @@ -using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Data.ProcessMaps.Operations; using System.Collections.Generic; @@ -8,7 +7,7 @@ public class ProcessMapPlanLoadCapacityTemplate : ITemplateParameters { public string SheetName => "Выработка нагрузки"; - public int HeaderRowsCount => 3; + public int HeaderRowsCount => 2; public string FileName => "ProcessMapPlanLoadCapacity.xlsx"; diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationTemplate.cs index 2be34afd..4dff307e 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationTemplate.cs @@ -21,7 +21,7 @@ public class ProcessMapPlanOscillationTemplate : ITemplateParameters { nameof(ProcessMapPlanOscillationDto.RpmLeft), new Cell(6, typeof(double)) }, { nameof(ProcessMapPlanOscillationDto.TorqueMaxRight), new Cell(7, typeof(double)) }, { nameof(ProcessMapPlanOscillationDto.TorqueMaxLeft), new Cell(8, typeof(double)) }, - { nameof(ProcessMapPlanOscillationDto.Mode), new Cell(10, typeof(int)) }, - { nameof(ProcessMapPlanOscillationDto.Note), new Cell(11, typeof(string)) }, + { nameof(ProcessMapPlanOscillationDto.Mode), new Cell(9, typeof(int)) }, + { nameof(ProcessMapPlanOscillationDto.Note), new Cell(10, typeof(string)) }, }; } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamingSlideTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamingSlideTemplate.cs index 954803b5..90827fd2 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamingSlideTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamingSlideTemplate.cs @@ -7,7 +7,7 @@ public class ProcessMapPlanReamingSlideTemplate : ITemplateParameters { public string SheetName => "Проработка для слайда"; - public int HeaderRowsCount => 2; + public int HeaderRowsCount => 3; public string FileName => "ProcessMapPlanReamingSlide.xlsx"; diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingToTheModeTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingToTheModeTemplate.cs index 4d0a35a0..a50e5c90 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingToTheModeTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingToTheModeTemplate.cs @@ -9,7 +9,7 @@ public class ProcessMapPlanSwitchingToTheModeTemplate : ITemplateParameters { public string SheetName => "Выход на плановый расход"; - public int HeaderRowsCount => 3; + public int HeaderRowsCount => 2; public string FileName => "ProcessMapPlanSwitchingToTheMode.xlsx"; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs index ac12c786..6facfc7c 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs @@ -24,5 +24,5 @@ public class ProcessMapPlanLoadCapacityController : { } - protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_проработка_слайд.xlsx"; + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_выработка_нагрузки.xlsx"; } \ No newline at end of file