diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs index 764d65cc..8d55a786 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs @@ -7,14 +7,17 @@ public double HookWeightSP { get; set; } = 20; public double PressureSP { get; set; } = 15; public double PosisionSP { get; set; } = 8; + public double DeltaWellDepthMax { get; set; } = 2.5; protected override bool DetectStart(DetectableTelemetry[] telemetry, int position) { var item = telemetry[position]; - var result = item.HookWeight < HookWeightSP && + var result = + item.HookWeight < HookWeightSP && item.Pressure < PressureSP && - item.BlockPosition < PosisionSP; + item.BlockPosition < PosisionSP && + (item.WellDepth - item.BitDepth) < DeltaWellDepthMax; return result; } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Specifications/Время в клиньях.md b/AsbCloudInfrastructure/Services/DetectOperations/Specifications/Время в клиньях.md index c6f29158..fedc6b74 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Specifications/Время в клиньях.md +++ b/AsbCloudInfrastructure/Services/DetectOperations/Specifications/Время в клиньях.md @@ -25,12 +25,20 @@ > Исправлено на совещании от 19.04.2022 16:50 +> Исправлено задачей в кайтен от 12.05.2022 16:49 + +считать время в клиньях только при соотношении глубина забоя - глубина долота меньше 2,5 метра + ``` Признак начала операции = (параметр «вес на крюке» < 22 тонн) И (давление < 15 атм) И -(положение талевого блока < 8) +(положение талевого блока < 8) И +(глубина забоя - глубина долота < 2,5) + + Признак окончания операции = (вес на крюке > 22 ) И (давление > 15 атм) -``` \ No newline at end of file +``` + diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx index 7f6212a7..5fe35ce8 100644 Binary files a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx and b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx differ