Merge pull request 'Фикс шаблонов РТК' (#297) from fix/process_map into dev

Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/297

AsbCloudInfrastructure/AsbCloudInfrastructure.csproj

@@ -8,6 +8,10 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;IDE0090;IDE0063;IDE0066;IDE0054</NoWarn>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Services\ProcessMapPlan\Templates\ProcessMapPlanReamingSlide.xlsx" />
+  </ItemGroup>
   
   <ItemGroup>
     <Content Include="CommonLibs\logo_720x404.png">
@@ -34,8 +38,6 @@
     <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanReamingSlide.xlsx" />
     <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanRecordingStaticMeasurement.xlsx" />
     <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanRotor.xlsx" />
-    <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanRotorLoweringBit.xlsx" />
-    <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanRotorRpmAcceleration.xlsx" />
     <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanShockTest.xlsx" />
     <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanSlide.xlsx" />
     <EmbeddedResource Include="Services\ProcessMapPlan\Templates\ProcessMapPlanStaticMeasurementOutput.xlsx" />

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";
 

AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationAnglesTemplate.cs

@@ -8,7 +8,7 @@ public class ProcessMapPlanOscillationAnglesTemplate : ITemplateParameters
 {
     public string SheetName => "Определение углов осцилляции";
 
-    public int HeaderRowsCount => 2;
+    public int HeaderRowsCount => 3;
 
     public string FileName => "ProcessMapPlanOscillationAngles.xlsx";
 

AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationTemplate.cs

@@ -7,7 +7,7 @@ public class ProcessMapPlanOscillationTemplate : ITemplateParameters
 {
     public string SheetName => "Осцилляция";
 
-    public int HeaderRowsCount => 3;
+    public int HeaderRowsCount => 2;
 
     public string FileName => "ProcessMapPlanOscillation.xlsx";
 
@@ -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)) },
     };
 }

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";
 

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";
 

AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs

@@ -24,5 +24,5 @@ public class ProcessMapPlanLoadCapacityController :
     {
     }
 
-    protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_проработка_слайд.xlsx";
+    protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_выработка_нагрузки.xlsx";
 }