Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pulizia di ulteriori riferimenti ai tools, compila!

Browse Source
This commit is contained in:
Samuele Locatelli
2020-04-22 17:00:19 +02:00
parent 3ceddc0ecd
commit b87ef29ed3
9 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Database/DatabaseContext.cs
-1
View File
@@ -35,7 +35,6 @@ namespace Thermo.Active.Database
// Tool tables
public DbSet<DbNcFamilyModel> Families { get; set; }
public DbSet<DbNcShankModel> Shanks { get; set; }
public DbSet<DbNcToolModel> Tools { get; set; }
public DbSet<DbNcMagazinePositionModel> MagazinePositions { get; set; }
public DbSet<QueueItemsModel> Queue { get; set; }
// Alarms
Thermo.Active.Database/Migrations/Configuration.cs
+3 -1
View File
@@ -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},
Thermo.Active.Model/Constants.cs
+1 -1
View File
@@ -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";
Thermo.Active.Model/DTOModels/DTOHeadModel.cs
-3
View File
@@ -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);
}
Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs
-2
View File
@@ -5,13 +5,11 @@ namespace Thermo.Active.Model.DTOModels.JobModels
public class DTOMetadataModel
{
public DTOGenericParamModel Generics;
public List<int> Tools;
public List<DTOJobCustomParamModel> Customs;
public DTOMetadataModel()
{
Generics = new DTOGenericParamModel();
Tools = new List<int>();
Customs = new List<DTOJobCustomParamModel>();
}
}
Thermo.Active.NC/NcAdapter.cs
+1 -12
View File
@@ -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;
Thermo.Active.Utils/supportFunctions.cs
-2
View File
@@ -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;
}
}
Thermo.Active/Listeners/ListenersHandler.cs
-4
View File
@@ -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);
Thermo.Active/Listeners/SignalR/SignalRListener.cs
-13
View File
@@ -182,17 +182,6 @@ namespace Thermo.Active.Listeners.SignalR
}
}
public static void SendMagazinesStatus(object magazinesStatus)
{
var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
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<NcHub>();
@@ -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