diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs
index 26dbe4ce..78bb9850 100644
--- a/MP-TAB3/Components/OdlMan.razor.cs
+++ b/MP-TAB3/Components/OdlMan.razor.cs
@@ -37,10 +37,6 @@ namespace MP_TAB3.Components
}
}
- private bool setupActive { get; set; } = false;
-
- private MappaStatoExpl? currRecMSE { get; set; } = null;
-
#endregion Public Properties
#region Protected Properties
@@ -250,6 +246,12 @@ namespace MP_TAB3.Components
return answ;
}
+ protected void GoToMachDetail()
+ {
+ // navigo!
+ NavMan.NavigateTo($"machine-detail");
+ }
+
///
/// Annulla setup ODL (come se avesse fatto FINE PROD)
///
@@ -417,11 +419,15 @@ namespace MP_TAB3.Components
// aggiorno note e tempo setup
await TabDServ.OdlUpdate(idxODLStart, MatrOpr, tcRichAttr, PzPallet, noteAttr);
- // controllo se TC Assegnato != TCRichiesto allora invio email x verifiche...
- if (currOdl.Tcassegnato != tcRichAttr)
+ // se abilitata gestione check TCiclo
+ if (approvTCEnabled)
{
- // invio email!
- await SendWarnTcChangeReq(idxODLStart, currOdl.Tcassegnato, tcRichAttr);
+ // controllo se TC Assegnato != TCRichiesto allora invio email x verifiche...
+ if (currOdl.Tcassegnato != tcRichAttr)
+ {
+ // invio email!
+ await SendWarnTcChangeReq(idxODLStart, currOdl.Tcassegnato, tcRichAttr);
+ }
}
await advStep(currStep++);
@@ -718,9 +724,11 @@ namespace MP_TAB3.Components
enableRiattrezzaggio = SMServ.GetConfBool("enableRiattrezzaggio");
showOdlProvv = SMServ.GetConfBool("showOdlProvv");
gPeriodReopenOdlTav = SMServ.GetConfInt("gPeriodReopenOdlTav");
+ approvTCEnabled = SMServ.GetConfBool("OptAdmApprTempiEnabled");
string rawEmailDest = SMServ.GetConf("_adminEmail");
emailAdmDest = rawEmailDest.Split(',').ToList();
}
+
protected override async Task OnParametersSetAsync()
{
if (!setupActive)
@@ -866,12 +874,6 @@ namespace MP_TAB3.Components
//NavMan.NavigateTo(NavMan.Uri, true);
}
- protected void GoToMachDetail()
- {
- // navigo!
- NavMan.NavigateTo($"machine-detail");
- }
-
protected async Task refreshAfterFixOdl(bool has2Refr)
{
if (has2Refr)
@@ -945,7 +947,7 @@ namespace MP_TAB3.Components
protected async Task SendWarnTcChangeReq(int idxOdl, decimal tcAss, decimal tcRich)
{
// carico altri parametri email...
- string oggetto = SMServ.GetConf("oggettoChgTc");
+ string oggetto = $"{SMServ.GetConf("Cliente")} | {SMServ.GetConf("oggettoChgTc")}"; ;
string corpoChgTc = SMServ.GetConf("corpoChgTc");
string mittente = SMServ.GetConf("_fromEmail");
string baseUrlAdmin = SMServ.GetConf("baseUrlAdmin");
@@ -1074,70 +1076,38 @@ namespace MP_TAB3.Components
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
-
+ private bool approvTCEnabled = false;
private bool confRett = true;
-
private double currVal = 0;
-
private List emailAdmDest = new List();
-
private bool enableAnnullaSetup = false;
-
private bool enableFixSetup = false;
-
private bool enableRiattrezzaggio = false;
-
private bool enableRPO = true;
-
private bool enableSchedaTecnica = false;
-
private bool enableSplitODL = false;
-
private int expTimeMsec = 500;
-
private bool forceCloseOdl = true;
-
private int gPeriodReopenOdlTav = 1;
-
private string IdxMaccSel = "";
-#if false
- private string IdxMaccSelLast = "";
-#endif
-
private int idxPOdlSel = 0;
-
private bool inAttr = false;
-
private bool isInProd = false;
-
- private bool isMaster = false;
-
- private bool isMulti = false;
-
- private bool isProcessing = false;
private bool isLoading = false;
-
+ private bool isMaster = false;
+ private bool isMulti = false;
+ private bool isProcessing = false;
private bool isSlave = false;
-
private int lastIdxPOdl = 0;
-
private string lblOut = "";
-
private int MaxVal = 10;
-
private int modoConfProd = 0;
-
private double nextVal = 0;
-
private string noteAttr = "";
-
private int numDayOdl = 5;
-
private int PzPallet = 1;
-
private string searchPodl = "";
private bool showAll = false;
-
private bool showChkCloseOdlVal = false;
private bool showOdlDetail = false;
private bool showOdlProvv = false;
@@ -1166,8 +1136,8 @@ namespace MP_TAB3.Components
}
private ODLExpModel currOdl { get; set; } = new ODLExpModel();
-
private PODLExpModel currPodl { get; set; } = new PODLExpModel();
+ private MappaStatoExpl? currRecMSE { get; set; } = null;
///
/// Verifica se l'ALTRA macchina NON abbia ODL valido (== 0)
@@ -1239,6 +1209,11 @@ namespace MP_TAB3.Components
}
}
+ private bool setupActive { get; set; } = false;
+#if false
+ private string IdxMaccSelLast = "";
+#endif
+
///
/// Verifica visibilità btn riprendi ODL su 2° tavola SE:
/// - sia un impianto MULTI (= con + tavole)
@@ -1368,7 +1343,7 @@ namespace MP_TAB3.Components
if (datiProdAct != null)
{
needConfProd = datiProdAct.Pz2RecTot > 0 && !isSlave;
- if(needConfProd)
+ if (needConfProd)
{
StateHasChanged();
}
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index f0034ddb..29ef60e2 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2401.908
+ 6.16.2401.1911
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 94813b65..cc97eabd 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2401.908
+ Versione: 6.16.2401.1911
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 11439f7d..4c2fcb7c 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2401.908
+6.16.2401.1911
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 19f0b99e..27aa0cb4 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2401.908
+ 6.16.2401.1911
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