diff --git a/MP.RIOC/MP.RIOC.csproj b/MP.RIOC/MP.RIOC.csproj index 4b9d8648..a893eba8 100644 --- a/MP.RIOC/MP.RIOC.csproj +++ b/MP.RIOC/MP.RIOC.csproj @@ -5,7 +5,7 @@ enable enable MP.RIOC - 8.16.2605.1207 + 8.16.2605.2519 @@ -17,6 +17,7 @@ + diff --git a/MP.RIOC/Program.cs b/MP.RIOC/Program.cs index a507237f..6ba4f593 100644 --- a/MP.RIOC/Program.cs +++ b/MP.RIOC/Program.cs @@ -78,6 +78,9 @@ builder.Services.AddHttpForwarder(); var redisMux = ConnectionMultiplexer.Connect(confRedis); builder.Services.AddSingleton(redisMux); +// registrazione FusionCache +builder.Services.AddFusionCache(); + // Registrazione dei servizi custom builder.Services.AddSingleton(); builder.Services.AddSingleton(); diff --git a/MP.RIOC/Resources/ChangeLog.html b/MP.RIOC/Resources/ChangeLog.html index ce196314..65c07daf 100644 --- a/MP.RIOC/Resources/ChangeLog.html +++ b/MP.RIOC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MP-RIOC -

Versione: 8.16.2605.1207

+

Versione: 8.16.2605.2519


Note di rilascio:
  • diff --git a/MP.RIOC/Resources/VersNum.txt b/MP.RIOC/Resources/VersNum.txt index 57e5daf4..a68d1899 100644 --- a/MP.RIOC/Resources/VersNum.txt +++ b/MP.RIOC/Resources/VersNum.txt @@ -1 +1 @@ -8.16.2605.1207 +8.16.2605.2519 diff --git a/MP.RIOC/Resources/manifest.xml b/MP.RIOC/Resources/manifest.xml index a43e833c..69dca7d7 100644 --- a/MP.RIOC/Resources/manifest.xml +++ b/MP.RIOC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 8.16.2605.1207 + 8.16.2605.2519 https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/MP.RIOC.zip https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor index e505b2c9..109b0421 100644 --- a/MP.SPEC/Components/ListPODL.razor +++ b/MP.SPEC/Components/ListPODL.razor @@ -43,7 +43,7 @@ else @foreach (var record in ListRecords) { - + @if (!(showRecipeConf || showRecipeArch)) { diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index f11ff3d5..6250ead8 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -34,20 +34,11 @@ namespace MP.SPEC.Components #region Public Methods - public string checkSelect(PODLExpModel record) + public string CheckSelect(PODLExpModel thisRec) { - string answ = ""; - if (currRecord != null) - { - try - { - answ = (currRecord.IdxPromessa == record.IdxPromessa) ? "table-info" : ""; - //answ = ((SelRecord.IdxMacchina == record.IdxMacchina) && (SelRecord.CodArticolo == record.CodArticolo) && (SelRecord.CodFase == record.CodFase)) ? "table-info" : ""; - } - catch - { } - } - return answ; + return currRecord?.IdxPromessa == thisRec?.IdxPromessa + ? "table-info" + : ""; } public void Dispose() @@ -229,7 +220,15 @@ namespace MP.SPEC.Components { ListRecords = null; isLoading = true; - SearchRecords = await MDService.POdlListGetFiltAsync(hasOdl, StatoSel, macchina, reparto, selDtStart, selDtEnd); + // verifico filtro odl... + if (actFilter.ShowKit) + { + SearchRecords = await MDService.POdlListGetFiltAsync(hasOdl, StatoSel, macchina, reparto, selDtStart, selDtEnd); + } + else + { + SearchRecords = await MDService.POdlToKitListGetFiltAsync(hasOdl, StatoSel, macchina, reparto, selDtStart, selDtEnd); + } if (totalCount != SearchRecords.Count) { totalCount = SearchRecords.Count; diff --git a/MP.SPEC/Data/SelectXdlParams.cs b/MP.SPEC/Data/SelectXdlParams.cs index e91ae7c9..f36c3402 100644 --- a/MP.SPEC/Data/SelectXdlParams.cs +++ b/MP.SPEC/Data/SelectXdlParams.cs @@ -26,6 +26,7 @@ namespace MP.SPEC.Data public string SearchVal { get; set; } = "*"; public string Header { get; set; } = ""; public int TotCount { get; set; } = 0; + public bool ShowKit { get; set; } = false; #endregion Public Properties diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 9deac4d1..27d724cd 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 8.16.2605.2517 + 8.16.2605.2518 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 9388728b..8e00d0ca 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 8.16.2605.2517

    +

    Versione: 8.16.2605.2518


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 45a6b113..16a16eda 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -8.16.2605.2517 +8.16.2605.2518 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 73dad968..4fce2715 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 8.16.2605.2517 + 8.16.2605.2518 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false