From 1d415a2275dd4bee1034b48981ec3039e758649f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 25 Nov 2020 12:37:36 +0100 Subject: [PATCH 1/3] =?UTF-8?q?update=20modalit=C3=A0=20conferma=20x=20TAB?= =?UTF-8?q?=20e=20IOB-WIN-SIM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MP-TAB/WebUserControls/BaseUserControl.cs | 9 +++++++ MP-TAB/WebUserControls/mod_ODL.ascx.cs | 23 ++++++++++++++-- MP-TAB/WebUserControls/mod_confProd.ascx.cs | 9 ------- MapoDb/DataLayer.cs | 30 ++++++++++++++++++--- 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/MP-TAB/WebUserControls/BaseUserControl.cs b/MP-TAB/WebUserControls/BaseUserControl.cs index 315fb269..373f2d19 100644 --- a/MP-TAB/WebUserControls/BaseUserControl.cs +++ b/MP-TAB/WebUserControls/BaseUserControl.cs @@ -9,6 +9,15 @@ namespace MoonProTablet.WebUserControls { public class BaseUserControl : System.Web.UI.UserControl //SteamWare.UserControl // { + #region Protected Fields + + /// + /// indica conferma con rettifica (evento 121) + /// + protected bool confRett = memLayer.ML.CRB("confRett"); + + #endregion Protected Fields + #region Internal Fields /// diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index 31a11470..36760884 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -582,10 +582,20 @@ namespace MoonProTablet.WebUserControls private void confermaProdOdl(bool confZero) { // 2016.11.17 NOTA: introdotti scarti, li confermiamo SEMPRE a zero se in setup, però da valutare SE a FINE ATTREZZAGGIO chiedere num pezzi e num scarti (saldo zero buoni) da inserire... + bool fatto = false; + DateTime adesso = DateTime.Now; if (confZero) { // confermo produzione ZERO pezzi (in setup) - DataLayerObj.confermaProdMacchina(idxMacchinaFix, memLayer.ML.CRI("modoConfProd"), 0, 0, DateTime.Now); + if (confRett) + { + // confermo al netto dei pezzi lasciati... + fatto = DataLayerObj.confermaProdMacchinaFull(idxMacchinaFix, memLayer.ML.CRI("modoConfProd"), 0, 0, 0, adesso); + } + else + { + fatto = DataLayerObj.confermaProdMacchina(idxMacchinaFix, memLayer.ML.CRI("modoConfProd"), 0, 0, adesso); + } } else // se NON sono in setup verifico se ho pz da confermare { @@ -593,7 +603,16 @@ namespace MoonProTablet.WebUserControls DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd = DataLayerObj.taPzProd2conf.GetData(idxMacchinaFix)[0]; if (rigaProd.pezziNonConfermati > 0) { - DataLayerObj.confermaProdMacchina(idxMacchinaFix, memLayer.ML.CRI("modoConfProd"), rigaProd.pezziNonConfermati, 0, DateTime.Now); + // confermo produzione ZERO pezzi (in setup) + if (confRett) + { + // confermo al netto dei pezzi lasciati... + fatto = DataLayerObj.confermaProdMacchinaFull(idxMacchinaFix, memLayer.ML.CRI("modoConfProd"), rigaProd.pezziNonConfermati, 0, 0, adesso); + } + else + { + fatto = DataLayerObj.confermaProdMacchina(idxMacchinaFix, memLayer.ML.CRI("modoConfProd"), rigaProd.pezziNonConfermati, 0, adesso); + } } } } diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.cs index 4e83f6b9..2e678258 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.cs @@ -7,15 +7,6 @@ namespace MoonProTablet.WebUserControls { public partial class mod_confProd : BaseUserControl { - #region Protected Fields - - /// - /// indica conferma con rettifica (evento 121) - /// - protected bool confRett = memLayer.ML.CRB("confRett"); - - #endregion Protected Fields - #region Public Fields /// diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index a22039b6..8152f4aa 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -16,6 +16,15 @@ namespace MapoDb /// public class DataLayer { + #region Protected Fields + + /// + /// indica conferma con rettifica (evento 121) + /// + protected bool confRett = memLayer.ML.CRB("confRett"); + + #endregion Protected Fields + #region Public Fields /// @@ -1152,7 +1161,6 @@ namespace MapoDb try { DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd = taPzProd2conf.GetData(idxMacchina.ToString())[0]; - // chiamo stored stp_ConfermaProduzCompleta(idxMacchina,MatrApp,dataFrom,dataTo,pezziConf) taPzProd2conf.stp_ConfermaProduzCompleta(idxMacchina, MatrOpr, rigaProd.DataFrom, DataOraApp, numPzConfermati, numPzScarto, modoConfProd, DataOraApp, true); // indico eseguito! answ = true; @@ -1495,11 +1503,27 @@ namespace MapoDb // chiamo conferma produzione... try { - taPzProd2conf.stp_ConfermaProduzCompleta(currData[0].IdxMacchina, MatrOpr, DateTime.Now.AddDays(-10), DateTime.Now, qtyConf, 0, 1, DateTime.Now, false); + string chiamata = confRett ? "confermaProdMacchinaFull" : "confermaProdMacchina"; + logger.lg.scriviLog($"Chiamata a {chiamata} con parametri {currData[0].IdxMacchina} |{MatrOpr} | {DateTime.Now.AddDays(-10)} | {DateTime.Now} | {qtyConf} | 0 | 1 | {DateTime.Now} | false", tipoLog.INFO); + string idxMacchinaSel = currData[0].IdxMacchina; + bool fatto = false; + if (confRett) + { + // confermo al netto dei pezzi lasciati... + fatto = confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, 0, adesso); + } + else + { + fatto = confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, adesso); + } + if (!fatto) + { + logger.lg.scriviLog($"ERRORE in chiamata {chiamata}", tipoLog.ERROR); + } } catch (Exception exc) { - logger.lg.scriviLog($"Eccezione in stp_ConfermaProduzCompleta{Environment.NewLine}{exc}", tipoLog.EXCEPTION); + logger.lg.scriviLog($"Eccezione in ConfermaProduzione{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } } // attendo 100 msec From 2d93c3cb25a4b6a98e478329268db436a1197899 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 25 Nov 2020 12:37:43 +0100 Subject: [PATCH 2/3] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 16d23fad..de405c06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1333']) { + withEnv(['NEXT_BUILD_NUMBER=1334']) { // 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' From 3f43b506513be7c69866dcc35a426c2303dcc36c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 25 Nov 2020 12:37:52 +0100 Subject: [PATCH 3/3] fix gitSPread --- gitSpread.bat | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gitSpread.bat b/gitSpread.bat index d8b081f8..ac068a7f 100644 --- a/gitSpread.bat +++ b/gitSpread.bat @@ -21,14 +21,13 @@ git push . %baseBranch%:stable REM Faccio push remoto condizionale if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:%baseBranch% ) - -if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:beta ) +if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:beta ) if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:develop ) +if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:SDK ) +if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:master ) +if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:stable ) if %pushRemote% GTR 3 ( git push gitlab.steamware %baseBranch%:ES3 ) if %pushRemote% GTR 3 ( git push gitlab.steamware %baseBranch%:Giancarlo ) -if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:master ) if %pushRemote% GTR 3 ( git push gitlab.steamware %baseBranch%:MongoDb ) -if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:SDK ) -if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:stable ) ECHO on \ No newline at end of file