diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index 0e1edab8..854573ba 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -106,21 +106,44 @@

@titleOdlDetail

-
- @if (idxPOdlSel == 0 && !inAttr) - { - - } -
+ @if (idxPOdlSel == 0) + { +
+
+ + +
+ @if (!inAttr) + { +
+ +
+ } +
+ }
- P.ODL: + @if (!showPOdlData) + { + ODL: + } + else + { + P.ODL: + }
- @currPodl.IdxPromessa + @if (currOdl != null && !showPOdlData) + { + @currOdl.IdxOdl + } + else + { + @currPodl.IdxPromessa + }
@@ -164,7 +187,7 @@ TCiclo:
- @if (currOdl != null && currOdl.Tcassegnato > 0) + @if (currOdl != null && currOdl.Tcassegnato > 0 && !showPOdlData) { @currOdl.Tcassegnato.ToString("N2") } @@ -179,7 +202,14 @@ Pz/pallet:
- @currPodl.PzPallet + @if (currOdl != null && !showPOdlData) + { + @currOdl.PzPallet + } + else + { + @currPodl.PzPallet + }
@@ -187,23 +217,42 @@
- @currPodl.Nome + @if (currOdl != null && !showPOdlData) + { + @currOdl.Nome + } + else + { + @currPodl.Nome + }
-
- Priorita: -
-
- @currPodl.Priorita -
+ @if (!showPOdlData) + { + } + else + { +
+ Priorita: +
+
+ @currPodl.Priorita +
+ }
-
- Data: -
-
- @($"{currPodl.DueDate:yyyy.MM.dd}") -
+ @if (!showPOdlData) + { + } + else + { +
+ Data: +
+
+ @($"{currPodl.DueDate:yyyy.MM.dd}") +
+ }
@@ -213,7 +262,7 @@ @if (!inAttr && !showSplitOdlRiattr) { -
+
@if (idxPOdlSel > 0) { @@ -223,7 +272,7 @@ }
-
+
@@ -268,7 +317,7 @@ @if (inAttr) { -
+
} @@ -276,7 +325,7 @@ { if (odlOk && showChkCloseOdlVal && !showSplitOdlRiattr) { -
+
@@ -286,7 +335,7 @@ } @if (enableRiattrezzaggio) { -
+
@if (showSplitOdlRiattr) { @@ -302,7 +351,7 @@ } @if (!inAttr && enableFixSetup) { -
+
} diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 7620ef97..d932d42a 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -965,14 +965,19 @@ namespace MP_TAB3.Components { showSplitOdlRiattr = !showSplitOdlRiattr; await ReloadXDL(true); + +#if false if (tcRichAttr == 0) { tcRichAttr = currPodl.Tcassegnato; } if (string.IsNullOrEmpty(noteAttr)) { + noteAttr = currOdl.Note; } + PzPallet = currOdl.PzPallet; +#endif } protected async Task SplitOdl() @@ -1120,8 +1125,8 @@ namespace MP_TAB3.Components private bool showChkCloseOdlVal = false; private bool showOdlDetail = false; - private bool showOdlProvv = false; + private bool showPOdlData = true; private bool showReopenOdlTav = false; private bool showSplitOdlOnTav = false; private bool showSplitOdlRiattr = false; @@ -1144,6 +1149,10 @@ namespace MP_TAB3.Components { get => IdxPOdlSel > 0 ? "bg-info text-light" : "bg-warning"; } + private string txtShowXDL + { + get => showPOdlData ? "PODL" : "ODL"; + } private ODLExpModel currOdl { get; set; } = new ODLExpModel(); private PODLExpModel currPodl { get; set; } = new PODLExpModel(); @@ -1326,12 +1335,12 @@ namespace MP_TAB3.Components private string titleOdlDetail { - get => IdxPOdlSel > 0 ? "Verifica parametri attrezzaggio NUOVO PODL" : inAttr ? "Parametri PODL in Attrezzaggio" : "Parametri ODL Corrente"; + get => IdxPOdlSel > 0 ? "Verifica parametri attrezzaggio NUOVO PODL" : inAttr ? "Parametri PODL in Attrezzaggio" : "Parametri PODL Corrente"; } private string txtBtnOdlDetail { - get => showOdlDetail ? "Nascondi Dettaglio ODL" : "MOSTRA Dettaglio ODL Corrente"; + get => showOdlDetail ? "Nascondi Dettaglio PODL" : "MOSTRA Dettaglio ODL Corrente"; } private string txtForceCloseOdl @@ -1564,11 +1573,13 @@ namespace MP_TAB3.Components { tcRichAttr = currPodl.Tcassegnato; noteAttr = currPodl.Note; + PzPallet = currPodl.PzPallet; } else { tcRichAttr = currOdl.TCRichAttr; noteAttr = currOdl.Note; + PzPallet = currOdl.PzPallet; } } } @@ -1579,12 +1590,13 @@ namespace MP_TAB3.Components if (IdxPOdlSel > 0) { await ReloadXDL(false); - // controllo se � cambiato PODL + // controllo se sia cambiato PODL if (IdxPOdlSel != lastIdxPOdl) { lastIdxPOdl = IdxPOdlSel; tcRichAttr = currPodl.Tcassegnato; noteAttr = currPodl.Note; + PzPallet = currPodl.PzPallet; } } } @@ -1622,6 +1634,8 @@ namespace MP_TAB3.Components currOdl = await TabDServ.OdlByIdx(currPodl.IdxOdl, false); } await updateIdxOdl(); + // sistemo TCiclo, note, pzPallet.. + fixTcNotePzPallet(); } private async Task updateIdxOdl() @@ -1636,6 +1650,19 @@ namespace MP_TAB3.Components } } + private void fixTcNotePzPallet() + { + if (tcRichAttr == 0) + { + tcRichAttr = IdxPOdlSel == 0 ? currOdl.Tcassegnato : currPodl.Tcassegnato; + } + if (string.IsNullOrEmpty(noteAttr)) + { + noteAttr = IdxPOdlSel == 0 ? currOdl.Note : currPodl.Note; + } + PzPallet = IdxPOdlSel == 0 ? currOdl.PzPallet : currPodl.PzPallet; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index f5ee89c8..d8acdf04 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2401.415 + 6.16.2401.417 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 9c445840..9d800083 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2401.415

+

Versione: 6.16.2401.417


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 1eab1f39..673f5369 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2401.415 +6.16.2401.417 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 6dfe8516..e90bc311 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2401.415 + 6.16.2401.417 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false