From 17b7965589c4a8cba3f4e2f2b6c6bf4524acf782 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 1 Dec 2022 13:09:39 +0100 Subject: [PATCH] Fix preselezione articolo PODL --- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor | 261 +++++++++++++++---------------- MP.SPEC/Pages/PODL.razor.cs | 12 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 6 files changed, 140 insertions(+), 141 deletions(-) diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index ea190326..b59041d0 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2212.112 + 6.16.2212.113 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 0c739be7..77590ffc 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -18,7 +18,7 @@ @if (addEnabled) { - + } @@ -26,26 +26,26 @@
@if (filtActive) { -
+
@**@ @if (selReparto != "*") { - + } @if (macchina != "*") { - + } @if (StatoSel != "*") { - + } -
+
} @if (hasOdl) { - @selDtStart   - @selDtEnd   + @selDtStart   + @selDtEnd   }
@@ -58,93 +58,93 @@
@if (currRecord != null) { -
-
-
-
@header
-
-
-
-
-
-
- Ricerca - -
+
+
+
+
@header
+
+
+
+
+
+
+ Ricerca +
-
-
- Articolo - @if (ListArticoli != null) { foreach (var item in ListArticoli) { @if (item.CodArticolo == currRecordControlli.CodArticolo) { - + } else { - + } } } - -
+
-
-
- # pz - - T.Ciclo - -
+
+
+
+ # pz + + T.Ciclo +
-
-
- Fase - @if (ListStati != null) { foreach (var item in ListStati) { @if (item.value == currRecordControlli.KeyRichiesta) { - + } else { - + } } } - + +
+
+
+
+
+
+
+ Gruppo + @if (currGruppoSel != null) + { + + @* *@ + }
-
-
+
+
- Gruppo - @if (currGruppoSel != null) - { - -@* *@ - } -
-
-
-
-
-
-
- Macchina - @if (ListMacchine != null) { foreach (var item in ListMacchine) @@ -154,112 +154,111 @@ if (item.IdxMacchina == currRecordControlli.IdxMacchina) { - + } else { - + } } } } - -
+
-
-
- Note - -
-
-
-
-
-
-
- Attivabile -
-
- -
+
+
+ Note + +
+
+
+
+
+
+
+
+ Attivabile +
+
+
-
+
+
+
+
+
+
-
-
- -
-
-
-
+
+
+
@if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") { - + } -
+
} - else if (addEnabled) + @* else if (addEnabled) { -
-
- @**@ -
- @if (reqNew) - { -
-
- Azienda - -
-
-
-
- Search - - Articolo - -
-
- } -
+
+
+
+ @if (reqNew) + { +
+
+ Azienda + +
+
+
+
+ Search + + Articolo + +
+
+ } +
+ }*@
@if (isLoading) { - + } else { - + }
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 9f349cad..60108e89 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -109,7 +109,6 @@ namespace MP.SPEC.Pages ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList(); } ListStati = await MDService.AnagStatiComm(); - //ListArticoli = await MDService.ArticoliGetSearch(100, currAzienda, artSearch); currAzienda = await MDService.tryGetConfig("AZIENDA"); padCodXdl = await MDService.tryGetConfig("padCodXdl"); } @@ -138,16 +137,17 @@ namespace MP.SPEC.Pages /// protected async Task reqNewPODL() { +#if false if (ListArticoli != null && ListArticoli.Count > 0) { - //var firstArt = ListArticoli.FirstOrDefault(); - //currArticolo = firstArt != null ? firstArt.CodArticolo : ""; var firstArt = ListArticoli.FirstOrDefault(x => x.Azienda.StartsWith(currAzienda)); if (firstArt != null) { - currArticolo = firstArt.Azienda; + currArticolo = firstArt.CodArticolo; } - } + } +#endif + artSearch = ""; string codExt = $"{currFase}"; string codGruppo = ""; if (ListGruppiFase != null && ListGruppiFase.Count > 0) @@ -339,7 +339,7 @@ namespace MP.SPEC.Pages set { _currRecord = value; - artSearch = value == null ? "" : value.CodArticolo; + artSearch = value == null ? "" : value.CodArticolo.Substring(0,2); } } diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index c0630b44..8c8af378 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2212.112

+

Versione: 6.16.2212.113


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index ce6574ae..f2e3a6f1 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.112 +6.16.2212.113 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 2ddcf582..56f4d49c 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.112 + 6.16.2212.113 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