diff --git a/Jenkinsfile b/Jenkinsfile
index 5afe7814..bc063d42 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=967']) {
+ withEnv(['NEXT_BUILD_NUMBER=968']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-TAB/ODL.aspx.cs b/MP-TAB/ODL.aspx.cs
index 37954eb8..a96c6f21 100644
--- a/MP-TAB/ODL.aspx.cs
+++ b/MP-TAB/ODL.aspx.cs
@@ -93,6 +93,9 @@ namespace MoonProTablet
///
private void Mod_ODL1_eh_reqUpdate(object sender, EventArgs e)
{
+ // forzo update macchina...
+ DataLayer.obj.taMSE.forceRefreshMacchina(idxMacchina);
+ // update display!
mod_dettMacchina1.doUpdate();
}
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index c62acab3..8afb80f6 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -533,13 +533,20 @@ namespace MoonProTablet.WebUserControls
DataLayer.saveCounter(idxMacchina, "0");
// imposto ODL su redis...
DataLayer.saveCurrODL(idxMacchina, idxODL_curr.ToString());
+#if false
// ricarico...
- Response.Redirect("~/ODL");
+ Response.Redirect("~/ODL");
+#endif
}
else
{
lblOut.Text = "Selezionare un ORDINE valido!";
}
+ // sollevo evento!
+ if (eh_reqUpdate != null)
+ {
+ eh_reqUpdate(this, new EventArgs());
+ }
}
///
/// inizio prod
@@ -657,8 +664,15 @@ namespace MoonProTablet.WebUserControls
}
// resetto ODL su redis...
DataLayer.emptyCurrODL(idxMacchina);
+#if false
// ricarico...
- Response.Redirect("~/ODL.aspx");
+ Response.Redirect("~/ODL.aspx");
+#endif
+ // sollevo evento!
+ if (eh_reqUpdate != null)
+ {
+ eh_reqUpdate(this, new EventArgs());
+ }
}
///
/// verifica se sia necessario confermare la prod dell'ODL precedente prima di chiudere e lo fa in automatico...
@@ -681,6 +695,11 @@ namespace MoonProTablet.WebUserControls
DataLayer.obj.confermaProdMacchina(idxMacchina, memLayer.ML.CRI("modoConfProd"), rigaProd.pezziNonConfermati, 0, DateTime.Now);
}
}
+ // sollevo evento!
+ if (eh_reqUpdate != null)
+ {
+ eh_reqUpdate(this, new EventArgs());
+ }
}
///
/// mostra dati ed opzione x split ODL
@@ -744,6 +763,12 @@ namespace MoonProTablet.WebUserControls
// sistemo buttons!
bool splitOdl = false;
fixSplitBtn(splitOdl);
+
+ // sollevo evento!
+ if (eh_reqUpdate != null)
+ {
+ eh_reqUpdate(this, new EventArgs());
+ }
}
///
/// selezionato un ODL mostro note/tempo da validare
@@ -887,8 +912,15 @@ namespace MoonProTablet.WebUserControls
{
DataLayer.obj.taODL.dividiDaAltraTav(idxOdlAltra, DataLayer.MatrOpr, idxMacchina);
}
+#if false
// update!
- Response.Redirect("~/ODL.aspx");
+ Response.Redirect("~/ODL.aspx");
+#endif
+ // sollevo evento!
+ if (eh_reqUpdate != null)
+ {
+ eh_reqUpdate(this, new EventArgs());
+ }
}
}
}
\ No newline at end of file