From c64858a13af5c95cc2bf0c7abab4f69c7af06628 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 31 Jan 2020 13:16:35 +0100 Subject: [PATCH] Fix errore se lettura item inesistente --- Jenkinsfile | 2 +- NKC_WF/Web.config | 1 + NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5406ef9..d4e809c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=247']) { + withEnv(['NEXT_BUILD_NUMBER=249']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 8243c41..5584372 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -36,6 +36,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 48dec37..86b7d2e 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -391,8 +391,18 @@ namespace NKC_WF.WebUserControls { if (resetStatus) { - // riposto item a status 1... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + try + { + // SE item esiste... + var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); + if (tabItem.Count == 1) + { + // riposto item a status 1... + DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + } + } + catch + { } } // elimino item sel... itemIdSelected = 0; @@ -411,7 +421,7 @@ namespace NKC_WF.WebUserControls divItemError.Visible = showError; if (showError) { - displError("Item not found",true); + displError("Item not found", true); } if (showItem) { @@ -451,7 +461,7 @@ namespace NKC_WF.WebUserControls displError("Item declared SCRAP!", false); break; case 991: - displError("Item declared SCRAP with CNC program created!",false); + displError("Item declared SCRAP with CNC program created!", false); break; default: displError("ERROR: Item status UNKNOWN!", false);