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

Fix modello dati campi grp/CDC

Browse Source
This commit is contained in:
Samuele E. Locatelli
2025-10-30 10:06:21 +01:00
parent 694ddae4b9
commit 74e010cdfe
5 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgwCoreLib.Lux.Data/DbModel/Cost/ResourceModel.cs
+5
View File
@@ -23,6 +23,11 @@ namespace EgwCoreLib.Lux.Data.DbModel.Cost
[Key]
public int ResourceID { get; set; }
/// <summary>
/// Condice Risorsa x Raggruppamento / Ordinamento
/// </summary>
public string CodResource { get; set; } = "000";
/// <summary>
/// Nome/Descrizione
/// </summary>
EgwCoreLib.Lux.Data/DbModel/Task/PhaseModel.cs
+5
View File
@@ -23,6 +23,11 @@ namespace EgwCoreLib.Lux.Data.DbModel.Task
[Key]
public int PhaseID { get; set; }
/// <summary>
/// Condice Fase x Raggruppamento / Ordinamento
/// </summary>
public string CodPhase { get; set; } = "000";
/// <summary>
/// Nome Fase
/// </summary>
EgwCoreLib.Lux.Data/ModelBuilderExtensions.cs
+16 -16
View File
@@ -210,26 +210,26 @@ namespace EgwCoreLib.Lux.Data
// inizializzazione risorse
modelBuilder.Entity<ResourceModel>().HasData(
new ResourceModel { ResourceID = 1, Name = "Item Generico", FixedCost = 100, VariableCost = 100, OverHeadCost = 100, CostDriverID = 3, CostDriverBudget = 220 * 10, LaborCost = 100, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 2, Name = "Serramento (media annua globale)", FixedCost = 200000, VariableCost = 200000, OverHeadCost = 100000, CostDriverID = 3, CostDriverBudget = 220 * 10, LaborCost = 200000, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 3, Name = "Sezionatrice", FixedCost = 12000, VariableCost = 6000, OverHeadCost = 5000, CostDriverID = 1, CostDriverBudget = 220 * 4, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 4, Name = "Linea SAOMAD WoodPecker Just 3500", FixedCost = 100000, VariableCost = 30000, OverHeadCost = 15000, CostDriverID = 1, CostDriverBudget = 220 * 8, LaborCost = 40, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 5, Name = "Linea Pantografo", FixedCost = 24000, VariableCost = 6000, OverHeadCost = 5000, CostDriverID = 1, CostDriverBudget = 220 * 8, LaborCost = 35, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 6, Name = "Stazione Verniciatura", FixedCost = 24000, VariableCost = 6000, OverHeadCost = 3000, CostDriverID = 1, CostDriverBudget = 220 * 4, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 7, Name = "Verniciatura Manuale", FixedCost = 6000, VariableCost = 2000, OverHeadCost = 3000, CostDriverID = 1, CostDriverBudget = 220 * 1, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 8, Name = "Montaggio Manuale", FixedCost = 500, VariableCost = 500, OverHeadCost = 500, CostDriverID = 1, CostDriverBudget = 220 * 8 * 2, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 9, Name = "Installatore", FixedCost = 0, VariableCost = 3000, OverHeadCost = 0, CostDriverID = 1, CostDriverBudget = 220 * 8 * 2, LaborCost = 40, OverHeadPerc = 0.15M, EBTPerc = 0.15M }
new ResourceModel { ResourceID = 1, CodResource="0000", Name = "Item Generico", FixedCost = 100, VariableCost = 100, OverHeadCost = 100, CostDriverID = 3, CostDriverBudget = 220 * 10, LaborCost = 100, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 2, CodResource="0010", Name = "Serramento (media annua globale)", FixedCost = 200000, VariableCost = 200000, OverHeadCost = 100000, CostDriverID = 3, CostDriverBudget = 220 * 10, LaborCost = 200000, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 3, CodResource="0110", Name = "Sezionatrice", FixedCost = 12000, VariableCost = 6000, OverHeadCost = 5000, CostDriverID = 1, CostDriverBudget = 220 * 4, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 4, CodResource="0120.01", Name = "Linea SAOMAD WoodPecker Just 3500", FixedCost = 100000, VariableCost = 30000, OverHeadCost = 15000, CostDriverID = 1, CostDriverBudget = 220 * 8, LaborCost = 40, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 5, CodResource="0120.02", Name = "Linea Pantografo", FixedCost = 24000, VariableCost = 6000, OverHeadCost = 5000, CostDriverID = 1, CostDriverBudget = 220 * 8, LaborCost = 35, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 6, CodResource="0130.01", Name = "Stazione Verniciatura", FixedCost = 24000, VariableCost = 6000, OverHeadCost = 3000, CostDriverID = 1, CostDriverBudget = 220 * 4, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 7, CodResource="0130.02", Name = "Verniciatura Manuale", FixedCost = 6000, VariableCost = 2000, OverHeadCost = 3000, CostDriverID = 1, CostDriverBudget = 220 * 1, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 8, CodResource="0140", Name = "Montaggio Manuale", FixedCost = 500, VariableCost = 500, OverHeadCost = 500, CostDriverID = 1, CostDriverBudget = 220 * 8 * 2, LaborCost = 30, OverHeadPerc = 0.15M, EBTPerc = 0.15M },
new ResourceModel { ResourceID = 9, CodResource="0150", Name = "Installatore", FixedCost = 0, VariableCost = 3000, OverHeadCost = 0, CostDriverID = 1, CostDriverBudget = 220 * 8 * 2, LaborCost = 40, OverHeadPerc = 0.15M, EBTPerc = 0.15M }
);
// inizializzazione fasi
modelBuilder.Entity<PhaseModel>().HasData(
new PhaseModel { PhaseID = 1, Name = "Taglio", Description = "Taglio tronchetti" },
new PhaseModel { PhaseID = 2, Name ="Lavorazione CNC", Description="Lavorazione pezzi serramento" },
new PhaseModel { PhaseID = 3, Name = "Verniciatura", Description="Verniciatura" },
new PhaseModel { PhaseID = 4, Name = "Montaggio" , Description = "Assemblaggio completo" },
new PhaseModel { PhaseID = 5, Name = "Ferramenta" , Description = "Assemblaggio Ferramenta" },
new PhaseModel { PhaseID = 6, Name = "Installazione" , Description = "Installazione e posa in opera" },
new PhaseModel { PhaseID = 7, Name = "Produzione Completa" , Description = "Produzione Completa: Fase Unica complessiva" }
new PhaseModel { PhaseID = 1, CodPhase="010", Name = "Taglio", Description = "Taglio tronchetti" },
new PhaseModel { PhaseID = 2, CodPhase="020", Name ="Lavorazione CNC", Description="Lavorazione pezzi serramento" },
new PhaseModel { PhaseID = 3, CodPhase="030", Name = "Verniciatura", Description="Verniciatura" },
new PhaseModel { PhaseID = 4, CodPhase="030.01", Name = "Montaggio" , Description = "Assemblaggio completo" },
new PhaseModel { PhaseID = 5, CodPhase="030.02", Name = "Ferramenta" , Description = "Assemblaggio Ferramenta" },
new PhaseModel { PhaseID = 6, CodPhase="040", Name = "Installazione" , Description = "Installazione e posa in opera" },
new PhaseModel { PhaseID = 7, CodPhase="000", Name = "Produzione Completa" , Description = "Produzione Completa: Fase Unica complessiva" }
);
Lux.API/Lux.API.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>0.9.2510.3007</Version>
<Version>0.9.2510.3009</Version>
</PropertyGroup>
<ItemGroup>
Lux.UI/Components/Compo/JobTask/JobStepMan.razor.cs
+16
View File
@@ -38,6 +38,22 @@ namespace Lux.UI.Components.Compo.JobTask
protected List<JobStepModel> FiltRecords = new List<JobStepModel>();
protected List<JobStepModel> ListRecords = new List<JobStepModel>();
/// <summary>
/// Elenco ordinato fasi
/// </summary>
protected List<PhaseModel> ListPhasesOrd
{
get => ListPhases.OrderBy(x => x.CodPhase).ToList();
}
/// <summary>
/// Elenco ordinato risorse
/// </summary>
protected List<ResourceModel> ListResourcesOrd
{
get => ListResources.OrderBy(x => x.CodResource).ToList();
}
#endregion Protected Fields
protected int PhaseId