diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 39568dbe..105297cf 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -444,6 +444,8 @@ namespace MP.Data.Controllers
.DbSetODL
.Where(x => ((inCorso && x.DataFine == null) || (!inCorso && x.DataFine != null)) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
.AsNoTracking()
+ .Include(m => m.MachineNav)
+ .Include(a => a.ArticoloNav)
.OrderBy(x => x.IdxOdl)
.ToList();
}
diff --git a/MP.Data/DatabaseModels/ODLModel.cs b/MP.Data/DatabaseModels/ODLModel.cs
index 2f31ead6..7e7c0c15 100644
--- a/MP.Data/DatabaseModels/ODLModel.cs
+++ b/MP.Data/DatabaseModels/ODLModel.cs
@@ -33,6 +33,17 @@ namespace MP.Data.DatabaseModels
[MaxLength(50)]
public string CodCli { get; set; } = "";
+ ///
+ /// Navigazione oggetto Machine
+ ///
+ [ForeignKey("IdxMacchina")]
+ public virtual Macchine MachineNav { get; set; } = null!;
+ ///
+ /// Navigazione oggetto Articolo
+ ///
+ [ForeignKey("CodArticolo")]
+ public virtual AnagArticoli ArticoloNav { get; set; } = null!;
+
#endregion Public Properties
}
}
\ No newline at end of file
diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor
index fb225426..526a1cd9 100644
--- a/MP.SPEC/Components/ListODL.razor
+++ b/MP.SPEC/Components/ListODL.razor
@@ -20,12 +20,13 @@ else
@**@
Articolo |
+ Fase |
Macchina |
# pz |
T.Ciclo |
Inizio |
Note |
- Richiesta |
+ @* Richiesta | *@
|
@@ -38,9 +39,12 @@ else
@record.CodArticolo
+ @record.ArticoloNav.DescArticolo
|
+ @tradFase(record.KeyRichiesta) |
@record.IdxMacchina
+ @record.MachineNav.Descrizione
|
@record.NumPezzi
@@ -52,7 +56,7 @@ else
@record.DataInizio
|
@record.Note |
- @record.KeyRichiesta |
+ @*@record.KeyRichiesta | *@
@*@if (ArticoloDelEnabled(record.CodArticolo))
{
diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs
index 13af41c6..7ccfd34b 100644
--- a/MP.SPEC/Components/ListODL.razor.cs
+++ b/MP.SPEC/Components/ListODL.razor.cs
@@ -11,8 +11,6 @@ namespace MP.SPEC.Components
[Parameter]
public EventCallback PagerResetReq { get; set; }
- [Parameter]
- public EventCallback updateRecordCount { get; set; }
[Parameter]
public string StatoSel
@@ -27,6 +25,9 @@ namespace MP.SPEC.Components
}
}
+ [Parameter]
+ public EventCallback updateRecordCount { get; set; }
+
#endregion Public Properties
#region Public Methods
@@ -69,8 +70,9 @@ namespace MP.SPEC.Components
#region Protected Methods
- protected override void OnInitialized()
+ protected override async Task OnInitializedAsync()
{
+ ListStati = await MDService.AnagStatiComm();
MessageService.EA_PageUpdated += MessageService_EA_PageUpdated;
MessageService.EA_SearchUpdated += OnSeachUpdated;
}
@@ -102,11 +104,9 @@ namespace MP.SPEC.Components
#region Private Fields
private string _statoSel = "*";
-
private ODLModel? currRecord = null;
-
private List? ListRecords;
-
+ private List? ListStati;
private List? SearchRecords;
#endregion Private Fields
@@ -155,6 +155,20 @@ namespace MP.SPEC.Components
isLoading = false;
}
+ private string tradFase(string codFase)
+ {
+ string answ = codFase;
+ if (ListStati != null && ListStati.Count > 0)
+ {
+ var recSel = ListStati.FirstOrDefault(x => x.value == codFase);
+ if (recSel != null)
+ {
+ answ = recSel.label;
+ }
+ }
+ return answ;
+ }
+
#endregion Private Methods
}
}
\ No newline at end of file
|