diff --git a/Jenkinsfile b/Jenkinsfile index ab428c3e..536201ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1350']) { + withEnv(['NEXT_BUILD_NUMBER=1351']) { // 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-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 391097c4..e85dec40 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - Release|Any CPU + Debug|Any CPU MvcControllerEmptyScaffolder root/Common/MVC/Controller 600 diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index 3bf3694e..8765882c 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,7 +19,7 @@ - Release|Any CPU + Debug|Any CPU ApiControllerWithActionsScaffolder root/Controller diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index 3679bec0..c2cb7f33 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles IIS02 diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx index 7c874d9a..2343a226 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx +++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx @@ -1,13 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objCheck.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_ST_objCheck" %>
-
+
-
+
read
-
+
diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs index 2a810d69..adbd4a5e 100644 --- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs @@ -90,8 +90,12 @@ namespace MoonProTablet.WebUserControls private void processInput() { bool found = false; + MapoDb.DS_Arca.GiacenzeDataTable tabGiacenzeLotto = new MapoDb.DS_Arca.GiacenzeDataTable(); + MapoDb.DS_SheetTech.ST_ActualRowDataTable tabRichieste = new MapoDb.DS_SheetTech.ST_ActualRowDataTable(); + MapoDb.DS_SheetTech.ST_ActualRowRow datiBatchCheck; + MapoDb.DS_Arca.GiacenzeRow datiLotto; // per prima cosa recupero i valori "Pending" da leggere come candidati... - var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl); + tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl); if (tabRichieste != null && tabRichieste.Count > 0) { // cerco per EQ come primo step... @@ -111,30 +115,55 @@ namespace MoonProTablet.WebUserControls // se non trovato if (!found) { + // recupero record.. cercando in giacenza il LOTTO... + tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false); // controllo condizione tipo BATCH (speciale) - prima solo che CI SIA una richiesta di questo tipo var trovatoBatch = tabRichieste.Where(x => x.CheckType == "BATCH"); if (trovatoBatch != null && trovatoBatch.Count() > 0) { - // recupero record.. cercando in giacenza il LOTTO... - var tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false); if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0) { - var datiBatchCheck = trovatoBatch.FirstOrDefault(); - var datiLotto = tabGiacenzeLotto.FirstOrDefault(); + datiBatchCheck = trovatoBatch.FirstOrDefault(); + datiLotto = tabGiacenzeLotto.FirstOrDefault(); // registro trovato found = true; - lblMessage.Text = $"Parametro acquisito: {BCodeVal} --> {datiLotto.Cd_AR}"; - lblMessage.CssClass = "text-success"; // upsert controllo DataLayerObj.taSTChk.upsertQuery(idxOdl, datiBatchCheck.IdxST, datiBatchCheck.Oggetto, datiBatchCheck.Num, BCodeVal, datiLotto.Cd_AR, true, user_std.UtSn.utente); + // conto quanti check ci sono dopo, se calati --> ok altrimenti errore + var tabRichiestePost = DataLayerObj.taSTAR.getPendingByOdl(idxOdl); + if (tabRichiestePost.Count < tabRichieste.Count) + { + lblMessage.Text = $"Lotto riconosciuto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo acquisito"; + lblMessage.CssClass = "text-success"; + } + else + { + lblMessage.Text = $"Lotto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo NON richiesto"; + lblMessage.CssClass = "text-danger"; + } } } } + // se non trovato + if (!found) + { + if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0) + { + datiLotto = tabGiacenzeLotto.FirstOrDefault(); + lblMessage.Text = $"Lotto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo NON richiesto"; + lblMessage.CssClass = "text-danger"; + } + else + { + lblMessage.Text = $"Parametro non riconosciuto: {BCodeVal}"; + lblMessage.CssClass = "text-secondary"; + } + } } else { - lblMessage.Text = "Parametro non valido"; + lblMessage.Text = $"Parametro non valido: {BCodeVal}"; lblMessage.CssClass = "text-secondary"; } diff --git a/WebConfigSetter/WebConfigSetter.csproj b/WebConfigSetter/WebConfigSetter.csproj index 76fe124b..fa9a39dc 100644 --- a/WebConfigSetter/WebConfigSetter.csproj +++ b/WebConfigSetter/WebConfigSetter.csproj @@ -45,5 +45,8 @@ Always + + Always + \ No newline at end of file