diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor index cbb6bcfc..8b233bdc 100644 --- a/MP.SPEC/Components/ListDossiers.razor +++ b/MP.SPEC/Components/ListDossiers.razor @@ -6,99 +6,99 @@ @if (ListRecords == null) { - + } else if (totalCount == 0) { -
Nessun record trovato
+
Nessun record trovato
} else { - + @if (currFluxLogDto != null) { -
-
-
-
-
- Modifica Parametro -
-
+
+
+
+
+
+ Modifica Parametro +
+
@if (isEditing) { - PENDING CHANGES... + PENDING CHANGES... } +
+
+
+
+
+
+ MACCHINA +
-
-
-
-
- MACCHINA - -
-
-
-
- DATA - -
-
-
-
- DATA TYPE - -
-
-
-
- VALORE - -
-
+
+
+ DATA +
-
-
-
-
-
-
-
- -
-
-
-
- -
-
+
+
+
+ DATA TYPE + +
+
+
+
+ VALORE + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
} - - + + @if (currRecordClone != null) { -
-
-
-
-
- Nuovo Dossier -
-
-
- -
-
-
- MACCHINA - @if (ListMacchine != null) { foreach (var item in ListMacchine) @@ -106,89 +106,89 @@ else @if (item.IdxMacchina == currRecordClone.IdxMacchina) { - + } else { - + } } } - -
-
-
-
- FASE - +
+
+
+
+ FASE + -
-
+ +
+
-
-
- ARTICOLI +
+
+ ARTICOLI - @if (ListArticoli != null) { foreach (var item in ListArticoli) { @if (item.CodArticolo == currRecordClone.CodArticolo) { - + } else { - + } } } - -
-
+
- +
+
+ -
-
-
-
-
-
-
- -
-
-
-
- -
-
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
} - + @@ -196,149 +196,152 @@ else -
-
- - - -
-
+
+
+ + + + - - - - - - - - - + + + + + + + + + + + @foreach (var record in ListRecords) { - - + - + - + - + - + - + - + - + + } - -
+
@if (currRecord != null) { - - + + } -
- 		Articolo Fase Macchina Data Snap ODL
Articolo Fase Macchina Data Snap ODL
+
@if (isEditing == false) { - - - + + + @**@ } else { - + } - + @record.CodArticolo -
@record.ArticoloNav.DescArticolo
- 		+
@record.ArticoloNav.DescArticolo
+ 		@tradFase(record.KeyRichiesta) - + @record.IdxMacchina - + @record.DtRif - -
-
+
+
+
@record.IdxODL -
- @if (record.IdxODL > 0) +
+ @if (giacenzeConf == "true") { - + @if (record.IdxODL > 0) + { + + } } - - 		+ + @if (isEditing == false) { - + } else { - + } -
+ +
@if (!visualizzaFlux) { if (listaFlux == null) { -
Nessun record trovato
+
Nessun record trovato
} else { -
- - - - - - - - - - - +
+
- - Macchina Data Data Type - Valore -
+ + + + + + + + + + @foreach (var record in listaFlux) { - - - + + - + - + - + - + + } - -
+ + Macchina Data Data Type + Valore +
- - +
+ + @record.IdxMacchina - + @record.dtEvento - + @traduci(record.CodFlux) -
@record.CodFlux
- 		+
@record.CodFlux
+ 		@if (record.ValoreEdit != record.Valore) { -
@record.ValoreEdit
-
(@record.Valore)
+
@record.ValoreEdit
+
(@record.Valore)
} else { -
@record.ValoreEdit
+
@record.ValoreEdit
} -
-
+ + +
} } -
+
} diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 89106654..bfb14ba3 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -79,6 +79,7 @@ namespace MP.SPEC.Components #region Protected Fields protected string selAzienda = "*"; + protected string giacenzeConf = "false"; #endregion Protected Fields @@ -221,11 +222,18 @@ namespace MP.SPEC.Components } } + //prtected bool hasLic + //{ + // get => selAzienda == "GIACOVELLI"; + //} + protected override async Task OnInitializedAsync() { + await MDService.ConfigResetCache(); ListGruppiFase = await MDService.ElencoGruppiFase(); ListStati = await MDService.AnagStatiComm(); selAzienda = await MDService.tryGetConfig("AZIENDA"); + giacenzeConf = await MDService.tryGetConfig("SPEC_ShowGiacenze"); ListArticoli = await MDService.ArticoliGetSearch(100000, selAzienda, ""); ListMacchine = await MDService.MacchineGetFilt("*"); await reloadData(true); diff --git a/MP.SPEC/Components/ListGiacenze.razor b/MP.SPEC/Components/ListGiacenze.razor index 11fed2e6..ca1d90f0 100644 --- a/MP.SPEC/Components/ListGiacenze.razor +++ b/MP.SPEC/Components/ListGiacenze.razor @@ -25,13 +25,16 @@ { @foreach (var item in elencoGiacenze) { - + @item.IdxRG - +
+ @item.IdentRG + +
diff --git a/MP.SPEC/Components/ListGiacenze.razor.cs b/MP.SPEC/Components/ListGiacenze.razor.cs index 4c3e19d4..dbe28f59 100644 --- a/MP.SPEC/Components/ListGiacenze.razor.cs +++ b/MP.SPEC/Components/ListGiacenze.razor.cs @@ -19,6 +19,22 @@ namespace MP.SPEC.Components #region Protected Properties + + public string checkSelect(AnagGiacenzeModel recordSel) + { + string answ = ""; + if (BatchSel != null) + { + try + { + answ = (BatchSel == recordSel.IdentRG) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + protected List? elencoGiacenze { get; set; } = null; #endregion Protected Properties diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index af941906..6c73a7c6 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2212.108 + 6.16.2212.110 diff --git a/MP.SPEC/Pages/Giacenze.razor b/MP.SPEC/Pages/Giacenze.razor index 707f13b9..37cd78c3 100644 --- a/MP.SPEC/Pages/Giacenze.razor +++ b/MP.SPEC/Pages/Giacenze.razor @@ -1,68 +1,75 @@ @page "/Giacenze" -
-
-
-
-

Giacenze

-
- @if (odlExp == null) - { - - } - else - { -
-
- ODL @(odlExp.IdxOdl.ToString(padCodXdl)) -
-
-
- @odlExp.DataInizio -
-
- >> -
-
- @odlExp.DataFine -
-
+@if (giacenzeConf == "false") +{ +
NOT ALLOWED
+} +else +{ +
+
+
+
+

Giacenze

-
-
- @odlExp.CodArticolo -
-
- @odlExp.DescArticolo -
- -
- } -
-
-
- @if (IdxOdl == 0) - { - - } - else - { -
-
- -
- @if (!string.IsNullOrEmpty(BatchSel)) + @if (odlExp == null) { -
- + + } + else + { +
+
+ ODL @(odlExp.IdxOdl.ToString(padCodXdl)) +
+
+
+ @odlExp.DataInizio +
+
+ >> +
+
+ @odlExp.DataFine +
+
+
+
+
+ @odlExp.CodArticolo +
+
+ @odlExp.DescArticolo +
+
}
- } -
- @*
+
+
+ @if (IdxOdl == 0) + { + + } + else + { +
+
+ +
+ @if (!string.IsNullOrEmpty(BatchSel)) + { +
+ +
+ } +
+ } +
+ @*
*@ -
+
+} diff --git a/MP.SPEC/Pages/Giacenze.razor.cs b/MP.SPEC/Pages/Giacenze.razor.cs index 9469246a..8fed01fe 100644 --- a/MP.SPEC/Pages/Giacenze.razor.cs +++ b/MP.SPEC/Pages/Giacenze.razor.cs @@ -26,6 +26,8 @@ namespace MP.SPEC.Pages protected override async Task OnInitializedAsync() { + await MDService.ConfigResetCache(); + giacenzeConf = await MDService.tryGetConfig("SPEC_ShowGiacenze"); await Task.Delay(1); padCodXdl = await MDService.tryGetConfig("padCodXdl"); var uri = NavManager.ToAbsoluteUri(NavManager.Uri); @@ -47,6 +49,7 @@ namespace MP.SPEC.Pages private NavigationManager NavManager { get; set; } = null!; private string padCodXdl { get; set; } = "00000"; + private string giacenzeConf = "false"; [Inject] private ISessionStorageService sessionStorage { get; set; } = null!; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 348059af..1043a525 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2212.108

+

Versione: 6.16.2212.110


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 5cf82d1a..41a84888 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.108 +6.16.2212.110 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 51bdb11a..f0660863 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.108 + 6.16.2212.110 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