diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index c73563aa..8f555551 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -366,8 +366,8 @@ namespace MP.Data.Controllers .AsNoTracking() .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodArticolo == "*" || x.CodArticolo == CodArticolo) && (x.DtRif >= DtStart && x.DtRif <= DtEnd)) .Include(m => m.MachineNav) - //.Include(o => o.OdlNav) .Include(a => a.ArticoloNav) + ////.Include(o => o.OdlNav) .OrderByDescending(x => x.DtRif) .ToList(); } diff --git a/MP.Data/DatabaseModels/Macchine.cs b/MP.Data/DatabaseModels/Macchine.cs index 858e9709..5cd3c9ac 100644 --- a/MP.Data/DatabaseModels/Macchine.cs +++ b/MP.Data/DatabaseModels/Macchine.cs @@ -17,10 +17,43 @@ namespace MP.Data.DatabaseModels [Key] public string IdxMacchina { get; set; } + /// + /// Cod macchina + /// public string CodMacchina { get; set; } = ""; + /// + /// Nome macchina + /// public string Nome { get; set; } = ""; + /// + /// Descrizione macchina + /// public string Descrizione { get; set; } = ""; + /// + /// Patch del file json di configurazione di una ricetta + /// public string RecipePath { get; set; } = ""; + /// + /// Path (assoluto!) dell'archivio ricette da impiegare + /// + public string RecipeArchivePath { get; set; } = ""; + + /// + /// Indica se abbia ricetta calcolata + /// + [NotMapped] + public bool hasRecipeCalc + { + get => !string.IsNullOrEmpty(RecipePath); + } + /// + /// Indica se abbia ricetta calcolata + /// + [NotMapped] + public bool hasRecipeArch + { + get => !string.IsNullOrEmpty(RecipeArchivePath); + } //public string Note { get; set; } = ""; //public string url { get; set; } = ""; diff --git a/MP.Data/DatabaseModels/PODLExpModel.cs b/MP.Data/DatabaseModels/PODLExpModel.cs index 849fb33d..ff1c3cfc 100644 --- a/MP.Data/DatabaseModels/PODLExpModel.cs +++ b/MP.Data/DatabaseModels/PODLExpModel.cs @@ -38,6 +38,8 @@ namespace MP.Data.DatabaseModels [MaxLength(50)] public string CodCli { get; set; } = ""; public DateTime InsertDate { get; set; } = DateTime.Now; + [MaxLength(500)] + public string Recipe { get; set; } = ""; [NotMapped] public string CodFase diff --git a/MP.Data/DatabaseModels/PODLModel.cs b/MP.Data/DatabaseModels/PODLModel.cs index 2575e287..668fbb87 100644 --- a/MP.Data/DatabaseModels/PODLModel.cs +++ b/MP.Data/DatabaseModels/PODLModel.cs @@ -39,6 +39,8 @@ namespace MP.Data.DatabaseModels [MaxLength(50)] public string CodCli { get; set; } = ""; public DateTime InsertDate { get; set; } = DateTime.Now; + [MaxLength(500)] + public string Recipe { get; set; } = ""; [NotMapped] public string CodFase diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index d4433522..435fd7f3 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -153,7 +153,7 @@ namespace MP.SPEC.Components await Task.Delay(1); var done = await MDService.DossiersDeleteRecord(selRec); currRecord = null; - await reloadData(true); + await ReloadData(true); visualizzaFlux = true; await Task.Delay(1); } @@ -206,7 +206,7 @@ namespace MP.SPEC.Components currRecordClone.Valore = newVal; // METODO PER INSERT DOSSIER + FLUX await MDService.DossiersInsert(currRecordClone); - //await reloadData(true); + //await ReloadData(true); currRecordClone = null; isEditing = false; await Task.Delay(1); @@ -236,7 +236,7 @@ namespace MP.SPEC.Components giacenzeConf = await MDService.tryGetConfig("SPEC_ShowGiacenze"); ListArticoli = await MDService.ArticoliGetSearch(100000, selAzienda, ""); ListMacchine = await MDService.MacchineGetFilt("*"); - await reloadData(true); + await ReloadData(true); } protected override async Task OnParametersSetAsync() @@ -244,7 +244,7 @@ namespace MP.SPEC.Components if (!lastFilter.Equals(SelFilter)) { lastFilter = SelFilter.clone(); - await reloadData(true); + await ReloadData(true); } } @@ -299,7 +299,7 @@ namespace MP.SPEC.Components protected async Task UpdateData() { currRecord = null; - await reloadData(true); + await ReloadData(true); } #endregion Protected Methods @@ -429,7 +429,7 @@ namespace MP.SPEC.Components isEditing = true; } - private async Task reloadData(bool setChanged) + private async Task ReloadData(bool setChanged) { isLoading = true; SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtStart, SelDtEnd); diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 52e760a1..6e619ef2 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2302.2218 + 6.16.2303.3117 @@ -39,7 +39,7 @@ - + diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 26162ed4..79d0c356 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2302.2218

+

Versione: 6.16.2303.3117


Note di rilascio: