diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor index e7f4f399..4e8f6fae 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor +++ b/MP-TAB-SERV/Components/OdlMan.razor @@ -10,237 +10,248 @@ } else { - @if (needConfProd) + @if (isSlave) { -
-
-
@lblWarnHead
-
@lblWarnBody @numPz2Conf.ToString("N0") pz NC
+
+
+
@(Traduci("lblWarnHeadSlave"))
+
@(Traduci("lblWarnBodySlave"))
- @if (!odlOk) - { -
- -
- } } else { -
- Slave machine man -
-
- Check articolo in revisione -
- @if (cancelSetupEnabled) + @if (needConfProd) { -
- -
- } - - @if (!inAttr && !showOdlDetail) - { -
- -
- } - - @if (showOdlDetail || inAttr) - { -
-
-
-
-

@titleOdlDetail

-
-
- @if (idxPOdlSel == 0 && !inAttr) - { - - } -
-
-
-
-
-
- P.ODL: -
-
- @currPodl.IdxPromessa.ToString("N0") -
-
-
-
- Rif: -
-
- @currPodl.KeyRichiesta -
-
-
-
- Cod: -
-
- @currPodl.CodArticolo -
-
-
-
-
-
- Articolo: -
-
- @currPodl.DescArticolo -
-
-
-
-
-
- Pezzi: -
-
- @currPodl.NumPezzi.ToString("N0") -
-
-
-
- TCiclo: -
-
- @if (currOdl != null && currOdl.Tcassegnato > 0) - { - @currOdl.Tcassegnato.ToString("N2") - } - else - { - @currPodl.Tcassegnato.ToString("N2") - } -
-
-
-
- Pz/pallet: -
-
- @currPodl.PzPallet -
-
-
-
- +
+
+
@lblWarnHead
+
@lblWarnBody @numPz2Conf.ToString("N0") pz NC
- } - - @if (!inAttr) - { -
- @if (idxPOdlSel > 0) - { - - } - else - { - - } -
-
-
- - -
- - -
-
-
- } - @if (idxPOdlSel > 0 || inAttr) - { -
-
- - -
-
-
- -
-
- Pz Pallet -
- -
-
- } - - @if (inAttr) - { -
- -
- } - else - { - if (odlOk) + @if (!odlOk) { -
-
- - -
+
+
} } -
- -
-
- -
-
- - @*
+ else + { +
+ Slave machine man +
+
+ Check articolo in revisione +
+ @if (cancelSetupEnabled) + { +
+ +
+ } + + @if (!inAttr && !showOdlDetail) + { +
+ +
+ } + + @if (showOdlDetail || inAttr) + { +
+
+
+
+

@titleOdlDetail

+
+
+ @if (idxPOdlSel == 0 && !inAttr) + { + + } +
+
+
+
+
+
+ P.ODL: +
+
+ @currPodl.IdxPromessa.ToString("N0") +
+
+
+
+ Rif: +
+
+ @currPodl.KeyRichiesta +
+
+
+
+ Cod: +
+
+ @currPodl.CodArticolo +
+
+
+
+
+
+ Articolo: +
+
+ @currPodl.DescArticolo +
+
+
+
+
+
+ Pezzi: +
+
+ @currPodl.NumPezzi.ToString("N0") +
+
+
+
+ TCiclo: +
+
+ @if (currOdl != null && currOdl.Tcassegnato > 0) + { + @currOdl.Tcassegnato.ToString("N2") + } + else + { + @currPodl.Tcassegnato.ToString("N2") + } +
+
+
+
+ Pz/pallet: +
+
+ @currPodl.PzPallet +
+
+
+
+ +
+
+ } + + @if (!inAttr) + { +
+ @if (idxPOdlSel > 0) + { + + } + else + { + + } +
+
+
+ + +
+ + +
+
+
+ } + @if (idxPOdlSel > 0 || inAttr) + { +
+
+ + +
+
+
+ +
+
+ Pz Pallet +
+ +
+
+ } + + @if (inAttr) + { +
+ +
+ } + else + { + if (odlOk) + { +
+
+ + +
+
+ } + } +
+ +
+
+ +
+
+ + @*
@@ -254,10 +265,11 @@
*@ -
-
- @lblOut -
+
+
+ @lblOut +
+ } } }
\ No newline at end of file diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs index c08f2941..c081fda9 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor.cs +++ b/MP-TAB-SERV/Components/OdlMan.razor.cs @@ -882,6 +882,7 @@ namespace MP_TAB_SERV.Components get => odlOk ? Traduci("ConfProdBeforeContinueHead") : Traduci("setOdlBeforeContinueHead"); } + private int MatrOpr { get => MServ.MatrOpr; diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 85516259..2a4052df 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2311.918 + 6.16.2311.919 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 02639326..cc1f4884 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2311.918

+

Versione: 6.16.2311.919


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 98e1300d..07056f18 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2311.918 +6.16.2311.919 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 70263c9f..ab8d78fe 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2311.918 + 6.16.2311.919 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false