diff --git a/MP-TAB3/Components/MachSel.razor.cs b/MP-TAB3/Components/MachSel.razor.cs
index 55576af5..77659a86 100644
--- a/MP-TAB3/Components/MachSel.razor.cs
+++ b/MP-TAB3/Components/MachSel.razor.cs
@@ -65,7 +65,11 @@ namespace MP_TAB3.Components
protected override async Task OnParametersSetAsync()
{
// inizilamente riporto machcina corrente da MSE
- if (RecMSE != null)
+ if (RecMSE == null)
+ {
+ IdxMaccSel = "";
+ }
+ else
{
if (string.IsNullOrEmpty(idxMaccSel))
{
diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs
index ff77bd88..d03d34ba 100644
--- a/MP-TAB3/Components/OdlMan.razor.cs
+++ b/MP-TAB3/Components/OdlMan.razor.cs
@@ -260,7 +260,7 @@ namespace MP_TAB3.Components
return;
// preparo gestione progress display
- MaxVal = 9;
+ MaxVal = 10;
isProcessing = true;
int currStep = 0;
await advStep(currStep);
@@ -291,6 +291,24 @@ namespace MP_TAB3.Components
await TabDServ.OdlClearSetup(idxODLCurr, IdxMaccSel);
await advStep(currStep++);
+
+ // se è multi processo ANCHE x altra tavola...
+ if (isMulti)
+ {
+ sb.AppendLine("---");
+ var tabOdlAltra = await TabDServ.OdlCurrByMacc(idxMaccAltraTav, true);
+ int idxOdlAltra = tabOdlAltra.IdxOdl;
+ await TabDServ.OdlFineProd(idxOdlAltra, idxMaccAltraTav);
+ sb.AppendLine(String.Format(evText, idxOdlAltra));
+ await processaEvento(idxMaccAltraTav, idxEvento, String.Format(evText, idxOdlAltra), idxOdlAltra);
+
+ // resetta PODL e rimuove ODL x poi TOGLIERE info di setup su macchina corrente
+ await TabDServ.OdlClearSetup(idxOdlAltra, idxMaccAltraTav);
+ await advStep(currStep++);
+ }
+ await advStep(currStep++);
+
+
// se è master --> chiamo update child!
if (isMaster)
{
@@ -305,7 +323,8 @@ namespace MP_TAB3.Components
}
catch
{ }
-
+ RecMSE = null;
+ await InvokeAsync(StateHasChanged);
// refresh finale
checkAll();
await RefreshData();
@@ -340,6 +359,8 @@ namespace MP_TAB3.Components
lblOut = sb.ToString();
}
await advStep(currStep++);
+ RecMSE = null;
+ await InvokeAsync(StateHasChanged);
// update button x setup da altra tavola...
checkAll();
// faccio refresh e riporto
@@ -375,6 +396,8 @@ namespace MP_TAB3.Components
lblOut = sb.ToString();
}
await advStep(currStep++);
+ RecMSE = null;
+ await InvokeAsync(StateHasChanged);
// update button x setup da altra tavola...
checkAll();
// faccio refresh e riporto
@@ -484,6 +507,7 @@ namespace MP_TAB3.Components
IdxPOdlSel = 0;
inAttr = false;
RecMSE = null;
+ await InvokeAsync(StateHasChanged);
// faccio refresh e riporto
await RefreshData();
await CheckAttr();
@@ -695,6 +719,7 @@ namespace MP_TAB3.Components
await TabDServ.FlushOdlCache();
IdxPOdlSel = 0;
RecMSE = null;
+ await InvokeAsync(StateHasChanged);
await RefreshData();
await CheckAttr();
inAttr = true;
@@ -860,6 +885,7 @@ namespace MP_TAB3.Components
// faccio refresh e riporto
IdxPOdlSel = 0;
RecMSE = null;
+ await InvokeAsync(StateHasChanged);
currOdl = new ODLExpModel();
inAttr = false;
IdxPOdlSel = 0;
@@ -870,7 +896,6 @@ namespace MP_TAB3.Components
await advStep(currStep++);
isProcessing = false;
await InvokeAsync(StateHasChanged);
- //NavMan.NavigateTo(NavMan.Uri, true);
}
protected async Task refreshAfterFixOdl(bool has2Refr)
@@ -1287,25 +1312,28 @@ namespace MP_TAB3.Components
// verifico se NON HA ODL...
if (emptyOdlMacc)
{
- // verifico SE siamo nel gracePeriod... chiuso da meno di 1h
- DateTime adesso = DateTime.Now;
- DateTime dtChiusura = DateTime.Now.AddHours(-1);
- try
+ if (!emptyOdlAltraMacc)
{
- var lastOdl = TabDServ.OdlLastByMacc(IdxMaccSel, true);
- if (lastOdl != null)
+ // verifico SE siamo nel gracePeriod... chiuso da meno di 1h
+ DateTime adesso = DateTime.Now;
+ DateTime dtChiusura = DateTime.Now.AddHours(-1);
+ try
{
- dtChiusura = lastOdl.DataFine ?? DateTime.Now.AddHours(-1);
+ var lastOdl = TabDServ.OdlLastByMacc(IdxMaccSel, true);
+ if (lastOdl != null)
+ {
+ dtChiusura = lastOdl.DataFine ?? DateTime.Now.AddHours(-1);
+ }
}
- }
- catch
- { }
+ catch
+ { }
- // ora verifico SE E SOLO SE è ANCORA in attrezzaggio ora verifico SE ALTRA
- // TAVOLA ha ODL...
- if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
- {
- answ = showReopenOdlTav;
+ // ora verifico SE E SOLO SE è ANCORA in attrezzaggio ora verifico SE ALTRA
+ // TAVOLA ha ODL...
+ if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
+ {
+ answ = showReopenOdlTav;
+ }
}
}
}
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index dbb1a7ac..ba819970 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2404.1117
+ 6.16.2404.1215
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index de71c3dc..d8ec2594 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2404.1117
+ Versione: 6.16.2404.1215
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index ddb93548..416bc5ad 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.1117
+6.16.2404.1215
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index f1eaaee7..93c29d1b 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2404.1117
+ 6.16.2404.1215
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
diff --git a/MP.Data/DatabaseModels/TaskResultModel.cs b/MP.Data/DatabaseModels/TaskResultModel.cs
index 881fe60d..28a4941d 100644
--- a/MP.Data/DatabaseModels/TaskResultModel.cs
+++ b/MP.Data/DatabaseModels/TaskResultModel.cs
@@ -11,7 +11,7 @@ using static MP.Data.Objects.Enums;
//
namespace MP.Data.DatabaseModels
{
- [Keyless]
+ [NotMapped]
public partial class TaskResultModel
{
#region Public Properties