diff --git a/Jenkinsfile b/Jenkinsfile
index 65cfd5da..84363965 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1359']) {
+ withEnv(['NEXT_BUILD_NUMBER=1360']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${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/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index bdd1f589..dffb2f84 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -46,6 +46,17 @@ namespace MoonProTablet.WebUserControls
}
}
+ ///
+ /// Verifica chiave showOdlProvv in tab Config
+ ///
+ protected bool enableRiattrezzaggio
+ {
+ get
+ {
+ return memLayer.ML.cdvb("enableRiattrezzaggio");
+ }
+ }
+
///
/// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
///
@@ -437,7 +448,7 @@ namespace MoonProTablet.WebUserControls
private void checkBtnStatus()
{
// di default rendo abilitato / disabilitato tutto in base al valore "isEnabled"
- lbtShowSplitODL.Enabled = isEnabled;
+ lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio;
lbtSplitODL.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled;
fixWCtrStatus(lbtShowSplitODL);
@@ -608,7 +619,7 @@ namespace MoonProTablet.WebUserControls
///
private void fixSplitBtn(bool splitOdl)
{
- lbtShowSplitODL.Visible = !splitOdl;
+ lbtShowSplitODL.Visible = !splitOdl && enableRiattrezzaggio;
chkCloseOdl.Visible = !splitOdl;
lbtSplitODL.Visible = splitOdl;
showNoteTC(splitOdl);
@@ -846,8 +857,7 @@ namespace MoonProTablet.WebUserControls
DataLayerObj.taODL.fixMachineSlave(idxMacchina, 30, 1);
}
// sistemo buttons!
- bool splitOdl = false;
- fixSplitBtn(splitOdl);
+ fixSplitBtn(false);
}
catch (Exception exc)
{
@@ -926,8 +936,7 @@ namespace MoonProTablet.WebUserControls
///
protected void lbtShowSplitODL_Click(object sender, EventArgs e)
{
- bool splitOdl = true;
- fixSplitBtn(splitOdl);
+ fixSplitBtn(true);
// recupero current idx
int currODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
updateTempoTc(currODL, true);
@@ -955,6 +964,12 @@ namespace MoonProTablet.WebUserControls
// effettuo split su nuovo ODL
DataLayerObj.taODL.splitODL(currODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCRichAttr, PzPallet, txtNote.Text, true, 0);
+ // se c'รจ gestione SchedaTecnica --> chiamo procedura update x lotti
+ if (enableSchedaTecnica)
+ {
+ int newODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
+ DataLayerObj.taMagELotti.UpsertByOdl(newODL, true);
+ }
// resetto ODL su redis...
DataLayerObj.emptyCurrODL(idxMacchinaFix);
@@ -964,8 +979,7 @@ namespace MoonProTablet.WebUserControls
// processo chiusura setup
processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrato Riattrezzaggio ODL (old: {0})", currODL), currODL);
// sistemo buttons!
- bool splitOdl = false;
- fixSplitBtn(splitOdl);
+ fixSplitBtn(false);
// sollevo evento!
if (eh_reqUpdate != null)
@@ -1258,6 +1272,7 @@ namespace MoonProTablet.WebUserControls
{
mod_tempoMSMC.modoTempo = timeMode.MC;
}
+ fixSplitBtn(false);
}
cmp_newODL.eh_newVal += Cmp_newODL_eh_newVal;
}