Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tentativi vari x refresh post setup ODL...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-11-02 20:56:38 +01:00
parent 2d493e0291
commit 2439c56f9c
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
MP-TAB/ODL.aspx.cs
+3
View File
@@ -93,6 +93,9 @@ namespace MoonProTablet
/// <param name="e"></param>
private void Mod_ODL1_eh_reqUpdate(object sender, EventArgs e)
{
// forzo update macchina...
DataLayer.obj.taMSE.forceRefreshMacchina(idxMacchina);
// update display!
mod_dettMacchina1.doUpdate();
}
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+35 -3
View File
@@ -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());
}
}
/// <summary>
/// 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());
}
}
/// <summary>
/// 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());
}
}
/// <summary>
/// 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());
}
}
/// <summary>
/// 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());
}
}
}
}