diff --git a/Thermo.Active.Database/DatabaseContext.cs b/Thermo.Active.Database/DatabaseContext.cs index ca40fcc0..f2ca59d6 100644 --- a/Thermo.Active.Database/DatabaseContext.cs +++ b/Thermo.Active.Database/DatabaseContext.cs @@ -35,7 +35,6 @@ namespace Thermo.Active.Database // Tool tables public DbSet Families { get; set; } public DbSet Shanks { get; set; } - public DbSet Tools { get; set; } public DbSet MagazinePositions { get; set; } public DbSet Queue { get; set; } // Alarms diff --git a/Thermo.Active.Database/Migrations/Configuration.cs b/Thermo.Active.Database/Migrations/Configuration.cs index a001cdc6..442b8348 100644 --- a/Thermo.Active.Database/Migrations/Configuration.cs +++ b/Thermo.Active.Database/Migrations/Configuration.cs @@ -42,7 +42,9 @@ namespace Thermo.Active.Database.Migrations new FunctionAccessModel() { Name = HEADS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 6}, new FunctionAccessModel() { Name = AXES_SELECTION, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7}, - new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8}, +#if false + new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8 }, +#endif new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9}, diff --git a/Thermo.Active.Model/Constants.cs b/Thermo.Active.Model/Constants.cs index b3c8bd98..24cde93b 100644 --- a/Thermo.Active.Model/Constants.cs +++ b/Thermo.Active.Model/Constants.cs @@ -239,11 +239,11 @@ namespace Thermo.Active.Model public const string SEND_NC_SOFTKEYS_DATA = "SEND_NC_SOFTKEYS_DATA"; public const string SEND_HEADS_DATA = "SEND_HEADS_DATA"; public const string SEND_AXIS_NAMES_DATA = "SEND_AXIS_NAMES_DATA"; - public const string SEND_MAGAZINES_STATUS = "SEND_MAGAZINES_STATUS"; public const string SEND_ACTIVE_PROGRAM_DATA = "SEND_ACTIVE_PROGRAM_DATA"; public const string SEND_QUEUE_DATA = "SEND_QUEUE_DATA"; public const string SEND_M155_DATA = "SEND_M155_DATA"; public const string SEND_SCADA_DATA = "SEND_SCADA_DATA"; + public const string SEND_RECIPE_STATUS = "SEND_RECIPE_STATUS"; public const string BROADCAST_DATA = "BROADCAST_DATA"; diff --git a/Thermo.Active.Model/DTOModels/DTOHeadModel.cs b/Thermo.Active.Model/DTOModels/DTOHeadModel.cs index cd7d30c3..37c106ab 100644 --- a/Thermo.Active.Model/DTOModels/DTOHeadModel.cs +++ b/Thermo.Active.Model/DTOModels/DTOHeadModel.cs @@ -88,9 +88,6 @@ namespace Thermo.Active.Model.DTOModels if (Rotation != item.Rotation) return false; - if (ToolData != null && !ToolData.Equals(item.ToolData)) - return false; - // Call Parent equals return base.Equals(item); } diff --git a/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs b/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs index d4bcda06..37edce0e 100644 --- a/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs +++ b/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs @@ -5,13 +5,11 @@ namespace Thermo.Active.Model.DTOModels.JobModels public class DTOMetadataModel { public DTOGenericParamModel Generics; - public List Tools; public List Customs; public DTOMetadataModel() { Generics = new DTOGenericParamModel(); - Tools = new List(); Customs = new List(); } } diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index b0654fa0..c175459d 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -877,18 +877,7 @@ namespace Thermo.Active.NC AbrasiveIsActive = head.AbrasiveIsActive, Configured = head.Configured, Rotation = head.Rotation, - WorkedTime = head.WorkedTime, - ToolData = head.Tool == null ? null : new DTOToolInSpindleModel() - { - ChildId = head.Tool.ChildId, - ToolName = head.Tool.ToolName, - Disabled = head.Tool.Disabled, - Measured = head.Tool.Measured, - Broken = head.Tool.Broken, - MaxSpeed = (int)head.Tool.MaxSpeed, - MaxLoad = (byte)head.Tool.MaxLoad, - ResidualLife = (int)head.Tool.ResidualLife - } + WorkedTime = head.WorkedTime }); } break; diff --git a/Thermo.Active.Utils/supportFunctions.cs b/Thermo.Active.Utils/supportFunctions.cs index bf12feed..f8762885 100644 --- a/Thermo.Active.Utils/supportFunctions.cs +++ b/Thermo.Active.Utils/supportFunctions.cs @@ -249,7 +249,6 @@ namespace Thermo.Active.Utils { job.Metadata.Generics.Description = metasFromFile.Description; job.Metadata.Generics.ExecutionTime = metasFromFile.ExecutionTime; - job.Metadata.Tools = metasFromFile.Tools; job.Metadata.Customs = metasFromFile.Customs; } } @@ -349,7 +348,6 @@ namespace Thermo.Active.Utils { jobData.Metadata.Generics.Description = metasFromFile.Description; jobData.Metadata.Generics.ExecutionTime = metasFromFile.ExecutionTime; - jobData.Metadata.Tools = metasFromFile.Tools; jobData.Metadata.Customs = metasFromFile.Customs; } } diff --git a/Thermo.Active/Listeners/ListenersHandler.cs b/Thermo.Active/Listeners/ListenersHandler.cs index 5681f4cf..5a440f41 100644 --- a/Thermo.Active/Listeners/ListenersHandler.cs +++ b/Thermo.Active/Listeners/ListenersHandler.cs @@ -69,10 +69,6 @@ namespace Thermo.Active.Listeners { SignalRListener.SendAxesToClient(a); })); - infos.Add(MessageServices.Current.Subscribe(SEND_MAGAZINES_STATUS, (a, b) => - { - SignalRListener.SendMagazinesStatus(a); - })); infos.Add(MessageServices.Current.Subscribe(SEND_ACTIVE_PROGRAM_DATA, (a, b) => { SignalRListener.SendActiveProgramData(a); diff --git a/Thermo.Active/Listeners/SignalR/SignalRListener.cs b/Thermo.Active/Listeners/SignalR/SignalRListener.cs index ff46e93f..f98376b0 100644 --- a/Thermo.Active/Listeners/SignalR/SignalRListener.cs +++ b/Thermo.Active/Listeners/SignalR/SignalRListener.cs @@ -182,17 +182,6 @@ namespace Thermo.Active.Listeners.SignalR } } - public static void SendMagazinesStatus(object magazinesStatus) - { - var context = GlobalHost.ConnectionManager.GetHubContext(); - if (!LastMagazineStatus.Equals(magazinesStatus)) - { - LastMagazineStatus = magazinesStatus as DTOMagazineActionModel; - - context.Clients.Group("ncData").magazinesStatus(magazinesStatus); - } - } - public static void SendActiveProgramData(object programData) { var context = GlobalHost.ConnectionManager.GetHubContext(); @@ -311,8 +300,6 @@ namespace Thermo.Active.Listeners.SignalR context.Clients.Group("ncData").headsData(LastHeadsData); // Send axesNames data context.Clients.Group("ncData").axesNames(LastAxesNamesData); - // Send magazine status - context.Clients.Group("ncData").magazinesStatus(LastMagazineStatus); // Send positions context.Clients.Group("ncData").axesPositions(LastAxesPositions); // Send active program data