diff --git a/Jenkinsfile b/Jenkinsfile
index 39e79bad..654328a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1408']) {
+ withEnv(['NEXT_BUILD_NUMBER=1410']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.13.${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-ADM/WebUserControls/cmp_PODL_OUT.ascx b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx
index 7ad87a36..8ab77c9b 100644
--- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx
+++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx
@@ -130,10 +130,10 @@
diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
index 05dc849d..f51ddf87 100644
--- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
+++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
@@ -302,7 +302,7 @@ namespace MP_ADM.WebUserControls
}
///
- /// Richiesto abbassamento priorità = ANTICIPA
+ /// Richiesto abbassamento priorità = RITARDA
///
///
///
@@ -319,7 +319,7 @@ namespace MP_ADM.WebUserControls
}
///
- /// Richiesto aumento priorità = RITARDA
+ /// Richiesto aumento priorità = ANTICIPA
///
///
///
@@ -396,7 +396,7 @@ namespace MP_ADM.WebUserControls
bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina;
#if false
- bool onlyProgrammed = chkUnassigned.Checked;
+ bool onlyProgrammed = chkUnassigned.Checked;
return enableChgPrio && onlyProgrammed && singleMachine;
#endif
return enableChgPrio && singleMachine;
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index aef850a3..5dc90174 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -92,13 +92,15 @@ namespace MoonProTablet.WebUserControls
{
get
{
- int answ = 0;
+ int answ = 1;
try
{
answ = cmp_selPzPallet.pzPallet;
}
- catch
- { }
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog($"Eccezione in recupero PzPallet{Environment.NewLine}{exc}");
+ }
return answ;
}
set