diff --git a/Jenkinsfile b/Jenkinsfile index f6560d0a..cf55d99c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1313']) { + withEnv(['NEXT_BUILD_NUMBER=1315']) { // env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' @@ -84,13 +84,6 @@ pipeline { parallel ( ADM_IO: { sleep 2 - if(env.enableIIS01 == "Y") - { - // ADM - bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj" - // IO - bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj" - } if(env.enableIIS02 == "Y") { // ADM @@ -108,6 +101,33 @@ pipeline { // MON bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-MON/MP-MON.csproj" } + }, + SITE_TAB: { + sleep 0 + if(env.enableIIS02 == "Y") + { + // SITE + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj" + // TAB + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj" + } + }, + failFast: false) + } + if (env.BRANCH_NAME == "beta") { + parallel ( + ADM_IO: { + sleep 2 + if(env.enableIIS01 == "Y") + { + // ADM + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj" + // IO + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj" + } + }, + LAND_MON: { + sleep 4 if(env.enableIIS01 == "Y") { // LAND @@ -125,13 +145,6 @@ pipeline { // TAB bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj" } - if(env.enableIIS02 == "Y") - { - // SITE - bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj" - // TAB - bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj" - } }, failFast: false) } diff --git a/MP-MON/Content/Site.css b/MP-MON/Content/Site.css index 25e6081f..e105fd9e 100644 --- a/MP-MON/Content/Site.css +++ b/MP-MON/Content/Site.css @@ -65,17 +65,17 @@ body .ui-overlay-c { } @media all and (min-width: 1440px) { body { - font-size: 1.2em; + font-size: 1.1em; } } @media all and (min-width: 1680px) { body { - font-size: 1.3em; + font-size: 1.2em; } } @media all and (min-width: 1920px) { body { - font-size: 1.8em; + font-size: 1.3em; } } @media all and (min-width: 2560px) { diff --git a/MP-MON/Content/Site.less b/MP-MON/Content/Site.less index 65b2de85..fa0546ac 100644 --- a/MP-MON/Content/Site.less +++ b/MP-MON/Content/Site.less @@ -77,19 +77,19 @@ body .ui-body-a, body .ui-body-c, body .ui-overlay-c { @media all and (min-width: 1440px) { body { - font-size: 1.2em; + font-size: 1.1em; } } @media all and (min-width: 1680px) { body { - font-size: 1.3em; + font-size: 1.2em; } } @media all and (min-width: 1920px) { body { - font-size: 1.8em; + font-size: 1.3em; } } diff --git a/MP-MON/Content/Site.min.css b/MP-MON/Content/Site.min.css index d36a4768..5736e337 100644 --- a/MP-MON/Content/Site.min.css +++ b/MP-MON/Content/Site.min.css @@ -1 +1 @@ -@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:.6em 0 .2em 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.mainHead,.logoImg{height:1.6em;}.body-content{padding:.1em .2em;margin-top:1.6em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:800px){body{font-size:.7em;}}@media all and (min-width:1024px){body{font-size:.8em;}}@media all and (min-width:1280px){body{font-size:.9em;}}@media all and (min-width:1440px){body{font-size:1.2em;}}@media all and (min-width:1680px){body{font-size:1.3em;}}@media all and (min-width:1920px){body{font-size:1.8em;}}@media all and (min-width:2560px){body{font-size:3em;}}@media all and (max-width:425px){body{font-size:.7em;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file +@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:.6em 0 .2em 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.mainHead,.logoImg{height:1.6em;}.body-content{padding:.1em .2em;margin-top:1.6em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:800px){body{font-size:.7em;}}@media all and (min-width:1024px){body{font-size:.8em;}}@media all and (min-width:1280px){body{font-size:.9em;}}@media all and (min-width:1440px){body{font-size:1.1em;}}@media all and (min-width:1680px){body{font-size:1.2em;}}@media all and (min-width:1920px){body{font-size:1.3em;}}@media all and (min-width:2560px){body{font-size:3em;}}@media all and (max-width:425px){body{font-size:.7em;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file diff --git a/MP-MON/Views/Shared/_footer.cshtml b/MP-MON/Views/Shared/_footer.cshtml index 13ba6768..b5a9c6b8 100644 --- a/MP-MON/Views/Shared/_footer.cshtml +++ b/MP-MON/Views/Shared/_footer.cshtml @@ -1,9 +1,25 @@ -
- MP MONitor + + +
+ MP MONitor
- @ViewBag.envir +
- 2007-@DateTime.Now.Year © -
+ 2007-@DateTime.Now.Year © +
\ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.cs index e019a535..9bba0380 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.cs @@ -46,17 +46,6 @@ namespace MoonProTablet.WebUserControls #region Protected Properties - /// - /// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...) - /// - protected bool isMulti - { - get - { - return DataLayerObj.isMulti(idxMacchina); - } - } - /// /// Numero pezzi PRODOTTI da ultima conferma /// diff --git a/MP-TAB/WebUserControls/mod_controlliProd.ascx.cs b/MP-TAB/WebUserControls/mod_controlliProd.ascx.cs index fea8036e..bf4a9fc6 100644 --- a/MP-TAB/WebUserControls/mod_controlliProd.ascx.cs +++ b/MP-TAB/WebUserControls/mod_controlliProd.ascx.cs @@ -7,65 +7,22 @@ namespace MoonProTablet.WebUserControls { public partial class mod_controlliProd : BaseUserControl { + #region Public Events + /// /// registrato nuovo valore /// public event EventHandler eh_newVal; + /// /// registrato nuovo valore /// public event EventHandler eh_reset; - /// - /// caricamento pagina - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - checkAll(); - } - } - private void checkAll() - { - fixSelMacc(); - checkOdl(); - lblOut.Text = ""; - switchBtnConferma(false); - lbtShowContr.Visible = odlOk; - lblConfProd.Visible = !odlOk; - } - /// - /// Verifica se abbia un ODL ATTIVO - /// - private void checkOdl() - { - lbtShowContr.Visible = odlOk; - lblConfProd.Visible = !odlOk; - lblMancaODL.Visible = !odlOk; - } + #endregion Public Events - /// - /// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...) - /// - protected bool isMulti - { - get - { - return DataLayerObj.isMulti(idxMacchina); - } - } + #region Public Properties - /// - /// Se la machcina è MULTI --> mostro selettore - /// - private void fixSelMacc() - { - divSelMacc.Visible = isMulti; - fixSelMaccControlli(); - } /// /// restituisce css disabled SE odl NON OK... /// @@ -76,29 +33,7 @@ namespace MoonProTablet.WebUserControls return odlOk ? "" : "disabled"; } } - /// - /// Verifica ODL OK (ovvero caricato x macchina...) - /// - public bool odlOk - { - get - { - bool answ = true; - // carico i dati preliminari: ODL - int idxOdl = 0; // userò ODL del turno - try - { - idxOdl = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL; - } - catch - { - logger.lg.scriviLog(string.Format("Errore a recuperare ODL per la macchina {0}", idxMacchinaFix), tipoLog.ERROR); - } - // se ODL > 0 è ok!!! - answ = (idxOdl > 0); - return answ; - } - } + /// /// idx macchina selezionata /// @@ -126,15 +61,84 @@ namespace MoonProTablet.WebUserControls memLayer.ML.setSessionVal("IdxMacchina", value); } } + /// - /// cambio stato visibilità pannello e testo button + /// Verifica ODL OK (ovvero caricato x macchina...) /// - /// - /// - protected void lbtShowContr_Click(object sender, EventArgs e) + public bool odlOk { - switchBtnConferma(!lbtOK.Visible); + get + { + bool answ = true; + // carico i dati preliminari: ODL + int idxOdl = 0; // userò ODL del turno + try + { + idxOdl = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL; + } + catch + { + logger.lg.scriviLog(string.Format("Errore a recuperare ODL per la macchina {0}", idxMacchinaFix), tipoLog.ERROR); + } + // se ODL > 0 è ok!!! + answ = (idxOdl > 0); + return answ; + } } + + #endregion Public Properties + + #region Private Methods + + private void checkAll() + { + fixSelMacc(); + checkOdl(); + lblOut.Text = ""; + switchBtnConferma(false); + lbtShowContr.Visible = odlOk; + lblConfProd.Visible = !odlOk; + } + + /// + /// Verifica se abbia un ODL ATTIVO + /// + private void checkOdl() + { + lbtShowContr.Visible = odlOk; + lblConfProd.Visible = !odlOk; + lblMancaODL.Visible = !odlOk; + } + + /// + /// Se la machcina è MULTI --> mostro selettore + /// + private void fixSelMacc() + { + divSelMacc.Visible = isMulti; + fixSelMaccControlli(); + } + + private void fixSelMaccControlli() + { + if (isMulti) + { + memLayer.ML.setSessionVal("IdxMacchinaControlli", subMaccSel); + } + else + { + memLayer.ML.setSessionVal("IdxMacchinaControlli", idxMacchina); + } + } + + private void resetControlli() + { + txtNoteContr.Text = ""; + // nascondo! + switchBtnConferma(false); + divNote.Visible = false; + } + /// /// determina comportamento btn conferma /// @@ -157,6 +161,54 @@ namespace MoonProTablet.WebUserControls } } } + + #endregion Private Methods + + #region Protected Methods + + protected void ddlSubMacc_DataBound(object sender, EventArgs e) + { + // se ho in memoria un valore LO REIMPOSTO... + if (subMaccSel != "") + { + // provo a preselezionare... + try + { + ddlSubMacc.SelectedValue = subMaccSel; + } + catch + { } + } + } + + protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e) + { + subMaccSel = ddlSubMacc.SelectedValue; + fixSelMaccControlli(); + checkAll(); + } + + protected void lbtKO_Click(object sender, EventArgs e) + { + divNote.Visible = true; + } + + protected void lbtOK_Click(object sender, EventArgs e) + { + // se ODL ok... + if (odlOk) + { + // Salvo controllo come OK + // sollevo evento! + DataLayerObj.taRC.insertQuery(idxMacchinaFix, DataLayerObj.MatrOpr, true, "", DateTime.Now); + if (eh_newVal != null) + { + eh_newVal(this, new EventArgs()); + } + } + resetControlli(); + } + /// /// salvo produzione /// @@ -178,81 +230,29 @@ namespace MoonProTablet.WebUserControls } } - private void resetControlli() - { - txtNoteContr.Text = ""; - // nascondo! - switchBtnConferma(false); - divNote.Visible = false; - } - - protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e) - { - subMaccSel = ddlSubMacc.SelectedValue; - fixSelMaccControlli(); - checkAll(); - } - - private void fixSelMaccControlli() - { - if (isMulti) - { - memLayer.ML.setSessionVal("IdxMacchinaControlli", subMaccSel); - } - else - { - memLayer.ML.setSessionVal("IdxMacchinaControlli", idxMacchina); - } - } - - protected void ddlSubMacc_DataBound(object sender, EventArgs e) - { - // se ho in memoria un valore LO REIMPOSTO... - if (subMaccSel != "") - { - // provo a preselezionare... - try - { - ddlSubMacc.SelectedValue = subMaccSel; - } - catch - { } - } - } /// - /// Sotto sistema (macchina) selezionato + /// cambio stato visibilità pannello e testo button /// - public string subMaccSel + /// + /// + protected void lbtShowContr_Click(object sender, EventArgs e) { - get + switchBtnConferma(!lbtOK.Visible); + } + + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) { - return memLayer.ML.StringSessionObj("subMaccSel"); - } - set - { - memLayer.ML.setSessionVal("subMaccSel", value); + checkAll(); } } - protected void lbtOK_Click(object sender, EventArgs e) - { - // se ODL ok... - if (odlOk) - { - // Salvo controllo come OK - // sollevo evento! - DataLayerObj.taRC.insertQuery(idxMacchinaFix, DataLayerObj.MatrOpr, true, "", DateTime.Now); - if (eh_newVal != null) - { - eh_newVal(this, new EventArgs()); - } - } - resetControlli(); - } - - protected void lbtKO_Click(object sender, EventArgs e) - { - divNote.Visible = true; - } + #endregion Protected Methods } } \ No newline at end of file diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index d8a32fdd..abc6de56 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -1492,8 +1492,8 @@ namespace MapoDb inputComandoMapo resCmd = scriviRigaEventoBarcode(idxMacchina, idxEvento, currData[0].CodArticolo, "ODL-SPLIT", 0, "", adesso, adesso); if (doConfirm) { - // attendo 1 sec - Thread.Sleep(1000); + // attendo 100 msec + Thread.Sleep(100); adesso = DateTime.Now; // chiamo conferma produzione... try @@ -1505,8 +1505,8 @@ namespace MapoDb logger.lg.scriviLog($"Eccezione in stp_ConfermaProduzCompleta{Environment.NewLine}{exc}", tipoLog.EXCEPTION); } } - // attendo 500 msec - Thread.Sleep(500); + // attendo 100 msec + Thread.Sleep(100); // chiamo splitOdl MapoDbObj.taODL.splitODL(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true, qtyNew); // attendo 1000 msec