diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs
index c06f425a..b43937eb 100644
--- a/MP-TAB3/Components/ProdConfirm.razor.cs
+++ b/MP-TAB3/Components/ProdConfirm.razor.cs
@@ -1,6 +1,8 @@
using global::Microsoft.AspNetCore.Components;
using MP.Data.DatabaseModels;
using MP.Data.Services;
+using NLog;
+using NLog.Fluent;
namespace MP_TAB3.Components
{
@@ -71,6 +73,34 @@ namespace MP_TAB3.Components
protected DateTime dtInizio { get; set; } = DateTime.Today.AddMonths(-2);
+ ///
+ /// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
+ ///
+ protected string idxMaccAltraTav
+ {
+ get
+ {
+ string answ = "";
+ try
+ {
+ // verifico se SIA una tavola (ha char "#")
+ int iSharp = IdxMaccSel.IndexOf('#');
+ if (iSharp > 0)
+ {
+ // ora verifico SE ALTRA TAVOLA ha ODL...
+ string nomeTav = IdxMaccSel.Substring(iSharp);
+ string altraTav = nomeTav.Substring(0, nomeTav.Length - 1);
+ altraTav += nomeTav.EndsWith("1") ? "2" : "1";
+ // sistemo nome
+ answ = IdxMaccSel.Replace(nomeTav, altraTav);
+ }
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+
protected int lblPz2RecBuoni
{
get => numPzConfermati - numPzLasciati;
@@ -124,7 +154,33 @@ namespace MP_TAB3.Components
///
protected bool odlOk
{
- get => (RecMSE != null && RecMSE.IdxOdl > 0);
+ get
+ {
+ bool answ = (RecMSE != null && RecMSE.IdxOdl > 0);
+ if (isMulti && (!answ && RecMSE != null && IdxMaccSel != RecMSE?.IdxMacchina))
+ {
+ int idxOdlSel = 0;
+ try
+ {
+ var pUpd = Task.Run(async () =>
+ {
+ var tabOdlSel = await TabDServ.OdlCurrByMacc(IdxMaccSel, true);
+ idxOdlSel = tabOdlSel.IdxOdl;
+ });
+ pUpd.Wait();
+ answ = idxOdlSel > 0;
+ }
+ catch (Exception exc)
+ {
+ Log.Error($"Errore Durante recupero idxOdlSel {Environment.NewLine}{exc}");
+ }
+ }
+ else
+ {
+ answ = (RecMSE != null && RecMSE.IdxOdl > 0);
+ }
+ return answ;
+ }
}
[Inject]
@@ -181,8 +237,6 @@ namespace MP_TAB3.Components
{
numPzLasciati = 0;
}
- // verifico SE fosse doppia...
- bool isMulti = false;
// verifico se la macchina sia configurata tra le MSFD...
if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina))
{
@@ -271,10 +325,12 @@ namespace MP_TAB3.Components
#region Private Fields
+ private static Logger Log = LogManager.GetCurrentClassLogger();
private bool chkPzBuoniNeg = false;
private bool confRett = false;
private bool enableMagPrint = false;
private bool enablePzProdLasciati = false;
+ private bool isMulti = false;
private string lblOut = "";
private int modoConfProd = 0;
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index ba819970..649c1921 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2404.1215
+ 6.16.2404.1216
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index d8ec2594..8972322b 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2404.1215
+ Versione: 6.16.2404.1216
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 416bc5ad..ccd74e32 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.1215
+6.16.2404.1216
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 93c29d1b..c0d79706 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2404.1215
+ 6.16.2404.1216
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