From f300974b1d17dbf78d8b05a3858f472d6bd954a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Sat, 16 Dec 2023 13:13:18 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D1=84=D0=BB=D0=B0=D0=B3=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B=20?= =?UTF-8?q?=D0=B2=20DetectedOperation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudDb/Model/DetectedOperation.cs | 2 +- .../Services/DetectOperations/DetectedOperationExportService.cs | 2 +- .../Services/DetectOperations/Detectors/DetectorAbstract.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AsbCloudDb/Model/DetectedOperation.cs b/AsbCloudDb/Model/DetectedOperation.cs index d2498ece..6245780c 100644 --- a/AsbCloudDb/Model/DetectedOperation.cs +++ b/AsbCloudDb/Model/DetectedOperation.cs @@ -95,7 +95,7 @@ namespace AsbCloudDb.Model /// /// Спин-мастер /// - AutoSpin = 1 << 7, + AutoSpinMaster = 1 << 7, } /// diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs index f833ae7d..c158d5d2 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs @@ -152,7 +152,7 @@ public class DetectedOperationExportService { var idCategory = current.IdCategory; if (idCategory == WellOperationCategory.IdSlide - && current.HasSubsystemFlag(DetectedOperation.EnabledSubsystemsFlags.AutoSpin)) + && current.HasSubsystemFlag(DetectedOperation.EnabledSubsystemsFlags.AutoSpinMaster)) return "Бурение в слайде с осцилляцией"; var category = wellOperationCategories.FirstOrDefault(o => o.Id == current.IdCategory); diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs index 0fde1096..ea2c3bba 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs @@ -163,7 +163,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors if(extraData.TryGetValue(DetectorDrilling.ExtraDataKeyHasOscillation, out var hasOscillation) && hasOscillation is true) { - enabledSubsystems |= (int)DetectedOperation.EnabledSubsystemsFlags.AutoSpin; + enabledSubsystems |= (int)DetectedOperation.EnabledSubsystemsFlags.AutoSpinMaster; return enabledSubsystems; }