diff --git a/MP.SPEC/Components/ListGiacenze.razor b/MP.SPEC/Components/ListGiacenze.razor index ca1d90f0..64bb5423 100644 --- a/MP.SPEC/Components/ListGiacenze.razor +++ b/MP.SPEC/Components/ListGiacenze.razor @@ -2,13 +2,18 @@ - + diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 35159bb7..a339bc42 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -1,7 +1,9 @@ using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.WebUtilities; using Microsoft.JSInterop; using MP.Data.DatabaseModels; using MP.SPEC.Data; +using MP.SPEC.Pages; using MP.SPEC.Services; using NLog; @@ -72,10 +74,15 @@ namespace MP.SPEC.Components [Inject] protected IOApiService MpIoApiCall { get; set; } = null!; + [Inject] + protected NavigationManager NavManager { get; set; } = null!; + #endregion Protected Properties #region Protected Methods + protected int odlCercato = 0; + /// /// Registra chiusura ODL alla data indicata /// @@ -138,6 +145,14 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { + if (NavManager.Uri.Contains("ODL?")) + { + var uri = NavManager.ToAbsoluteUri(NavManager.Uri); + if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("IdxOdl", out var _idxOdl)) + { + odlCercato = int.Parse(_idxOdl); + } + } ListStati = await MDService.AnagStatiComm(); } @@ -411,7 +426,14 @@ namespace MP.SPEC.Components isLoading = true; SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodFase, currFilter.CodReparto, currFilter.IdxMacchina, currFilter.DtStart, currFilter.DtEnd); totalCount = SearchRecords.Count; - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + if (NavManager.Uri.Contains("ODL?")) + { + ListRecords = SearchRecords.Where(x => x.IdxOdl == odlCercato).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + } + else + { + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + } await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); isLoading = false; diff --git a/MP.SPEC/Components/ListOdlLotto.razor b/MP.SPEC/Components/ListOdlLotto.razor index b487dc46..81c8c85b 100644 --- a/MP.SPEC/Components/ListOdlLotto.razor +++ b/MP.SPEC/Components/ListOdlLotto.razor @@ -1,32 +1,31 @@  -
+
- -
# - Lotto @if (!string.IsNullOrEmpty(BatchSel)) { } + else + { + # + } + + Lotto Prodotto Tipo
- - - - - - - @if (elencoODL == null || elencoODL.Count == 0) - { - - } - else - { + @if (elencoODL == null || elencoODL.Count == 0) + { + + } + else + { +
ODL
+ + + + + + @foreach (var item in elencoODL) { - + } - } - -
ODL
- + @item
+ + + } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 6c73a7c6..ea190326 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2212.110 + 6.16.2212.112 diff --git a/MP.SPEC/Pages/Giacenze.razor b/MP.SPEC/Pages/Giacenze.razor index 37cd78c3..6405b8bb 100644 --- a/MP.SPEC/Pages/Giacenze.razor +++ b/MP.SPEC/Pages/Giacenze.razor @@ -54,15 +54,17 @@ else else {
-
- -
- @if (!string.IsNullOrEmpty(BatchSel)) - { -
- +
+
+
- } + @if (!string.IsNullOrEmpty(BatchSel)) + { +
+ +
+ } +
}
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 1043a525..c0630b44 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2212.110

+

Versione: 6.16.2212.112


Note di rilascio: