diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 86bfc03a..5aacdc40 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Model/DTOModels/DTOHeadModel.cs b/Step.Model/DTOModels/DTOHeadModel.cs index 9c15046c..bc0401c3 100644 --- a/Step.Model/DTOModels/DTOHeadModel.cs +++ b/Step.Model/DTOModels/DTOHeadModel.cs @@ -6,6 +6,7 @@ public string Type; public bool inWarning; public bool inAlarm; + public bool OverrideEditable; public byte Override; public byte Process; @@ -26,6 +27,9 @@ if (Override != item.Override) return false; + if (OverrideEditable != item.OverrideEditable) + return false; + return true; } } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index ff7583c0..0433706f 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -515,12 +515,13 @@ namespace Step.NC Id = head.Id, Process = head.Process, Type = configuredHead.Type.ToString(), - ActualSpeed = head.ActualSpeed_Pressure, inWarning = head.ActualSpeed_Pressure >= configuredHead.WarningLimit, inAlarm = head.ActualSpeed_Pressure >= configuredHead.AlarmLimit, + OverrideEditable = head.OverrideEditable, + ActualSpeed = head.ActualSpeed_Pressure, Load = head.Load_Abrasive, MountedTool = head.MountedTool_Vacum, - Override = head.Override, + Override = head.Override }); } break; @@ -531,9 +532,10 @@ namespace Step.NC Id = head.Id, Process = head.Process, Type = configuredHead.Type.ToString(), - ActualPressure = head.ActualSpeed_Pressure, inWarning = head.MountedTool_Vacum >= configuredHead.WarningLimit, inAlarm = head.MountedTool_Vacum >= configuredHead.AlarmLimit, + OverrideEditable = head.OverrideEditable, + ActualPressure = head.ActualSpeed_Pressure, Abrasive = head.Load_Abrasive, Vacum = head.MountedTool_Vacum, Override = head.Override @@ -549,6 +551,7 @@ namespace Step.NC Type = configuredHead.Type.ToString(), inAlarm = false, inWarning = false, + OverrideEditable = head.OverrideEditable, Override = head.Override }); }