diff --git a/Step.Model/DTOModels/DTOHeadModel.cs b/Step.Model/DTOModels/DTOHeadModel.cs index 2ca99ed4..bffbd335 100644 --- a/Step.Model/DTOModels/DTOHeadModel.cs +++ b/Step.Model/DTOModels/DTOHeadModel.cs @@ -14,6 +14,7 @@ namespace Step.Model.DTOModels public bool IsActive; public bool IsSelected; public bool AbrasiveIsActive; + public uint WorkedTime; public override bool Equals(object obj) { @@ -42,8 +43,12 @@ namespace Step.Model.DTOModels return false; if (AbrasiveIsActive != item.AbrasiveIsActive) + return false; + + if (WorkedTime != item.WorkedTime) return false; + return true; } @@ -66,7 +71,6 @@ namespace Step.Model.DTOModels public ushort MountedTool; public bool Configured; public ROTATION Rotation; - public uint WorkedTime; public DTOToolInSpindleModel ToolData; public override bool Equals(object obj) @@ -93,9 +97,6 @@ namespace Step.Model.DTOModels if (Rotation != item.Rotation) return false; - if (WorkedTime != item.WorkedTime) - return false; - // Call Parent equals return base.Equals(item); } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index a76b1f6a..a1516121 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -875,7 +875,8 @@ namespace Step.NC Override = head.Override, IsActive = head.IsActive, IsSelected = head.IsSelected, - AbrasiveIsActive = head.AbrasiveIsActive + AbrasiveIsActive = head.AbrasiveIsActive, + WorkedTime = head.WorkedTime }); } break; @@ -894,7 +895,8 @@ namespace Step.NC Override = head.Override, IsActive = head.IsActive, IsSelected = head.IsSelected, - AbrasiveIsActive = head.AbrasiveIsActive + AbrasiveIsActive = head.AbrasiveIsActive, + WorkedTime = head.WorkedTime }); } break; diff --git a/Step/wwwroot/src/app_modules/production/components/head-production.vue b/Step/wwwroot/src/app_modules/production/components/head-production.vue index a5686e93..e824d623 100644 --- a/Step/wwwroot/src/app_modules/production/components/head-production.vue +++ b/Step/wwwroot/src/app_modules/production/components/head-production.vue @@ -122,7 +122,7 @@ export default { return true; }, getWorkedTime() { - return moment.utc(this.workedTime*1000).format('HH:mm:ss'); + return this.workedTime; }