From 6d6ab58c639f1981a7ba566155b6cd1ca57fe797 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 26 Mar 2021 18:35:39 +0100 Subject: [PATCH 1/4] Fix errore selezione pz pallet a 0 (log + def 1) --- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 From 2f5a0384fd21098391018c2ef832cb6c2755db57 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 26 Mar 2021 18:36:00 +0100 Subject: [PATCH 2/4] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 39e79bad..dbe06f61 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=1409']) { // 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' From 62db7b81cbf147b79774047608b1b31bbd628385 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 3 Apr 2021 17:43:56 +0200 Subject: [PATCH 3/4] fix reordering schedulatore --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dbe06f61..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=1409']) { + 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' From 400ffcdadeb3ae88ce798edf0c907d2d2972d188 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 3 Apr 2021 17:44:13 +0200 Subject: [PATCH 4/4] completo commit precedente --- MP-ADM/WebUserControls/cmp_PODL_OUT.ascx | 4 ++-- MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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;