From fde9145884c713707839d07059ff7178f2b5ec0e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 5 Jan 2021 17:39:45 +0100 Subject: [PATCH 1/4] Fix errore MP-IO x split ODL full --- MP-IO/Controllers/IOBController.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 7f5844dd..062413e3 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -336,12 +336,16 @@ namespace MP_IO.Controllers /// /// /// Esito chiamata (OK/vuoto) - public string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int roundStep) + public string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int? roundStep) { // attenzione! poiché nell'URL il carattere "#" fiene filtrato ci aspettiamo il carattere "|" che poi trasformiamo ora in "#" id = id.Replace("|", "#"); DataLayer DataLayerObj = new DataLayer(); - return DataLayerObj.forceSplitOdl(id, doConfirm, qtyFromLast, roundStep); + if (roundStep == null) + { + roundStep = 100; + } + return DataLayerObj.forceSplitOdl(id, doConfirm, qtyFromLast, (int)roundStep); } /// From db2b3d4f2016e13b1f2a6763e0fbdf8162f29da3 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 5 Jan 2021 18:16:10 +0100 Subject: [PATCH 2/4] fix messaggio errore COPY/PASTE --- MP-ADM/WebUserControls/cmp_ST_preview.ascx | 2 +- MP-ADM/WebUserControls/cmp_ST_preview.ascx.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MP-ADM/WebUserControls/cmp_ST_preview.ascx b/MP-ADM/WebUserControls/cmp_ST_preview.ascx index ea283621..9d1b29a6 100644 --- a/MP-ADM/WebUserControls/cmp_ST_preview.ascx +++ b/MP-ADM/WebUserControls/cmp_ST_preview.ascx @@ -8,7 +8,7 @@

Scheda Tecnica Articolo

- + PASTE
diff --git a/MP-ADM/WebUserControls/cmp_ST_preview.ascx.cs b/MP-ADM/WebUserControls/cmp_ST_preview.ascx.cs index 15c84f6c..f3b28068 100644 --- a/MP-ADM/WebUserControls/cmp_ST_preview.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_ST_preview.ascx.cs @@ -82,9 +82,8 @@ namespace MP_ADM.WebUserControls } } // verifica x stile copy - lbtCopy.CssClass = checkSource ? "btn btn-block btn-light" : "btn btn-block btn-outline-light"; + lbtCopy.CssClass = checkSource ? "btn btn-block btn-light border border-dark" : "btn btn-block btn-outline-light"; lbtPaste.Visible = showPaste; - lbtPaste.DataBind(); } #endregion Private Methods @@ -129,6 +128,8 @@ namespace MP_ADM.WebUserControls if (!Page.IsPostBack) { clipboard = ""; + string testo = traduci("ConfirmPasteFullST"); + lbtPaste.OnClientClick = SteamWare.jsUtils.getCBE(testo, false); } checkClipboard(); } From c451491c7c3cef08401b9358b7288b0967e6e67f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 5 Jan 2021 18:44:48 +0100 Subject: [PATCH 3/4] fix riattrezzaggio x gestione lotti scheda tecnica --- Jenkinsfile | 2 +- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 31 +++++++++++++++++++------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 65cfd5da..84363965 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1359']) { + withEnv(['NEXT_BUILD_NUMBER=1360']) { // 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-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index bdd1f589..dffb2f84 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -46,6 +46,17 @@ namespace MoonProTablet.WebUserControls } } + /// + /// Verifica chiave showOdlProvv in tab Config + /// + protected bool enableRiattrezzaggio + { + get + { + return memLayer.ML.cdvb("enableRiattrezzaggio"); + } + } + /// /// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina... /// @@ -437,7 +448,7 @@ namespace MoonProTablet.WebUserControls private void checkBtnStatus() { // di default rendo abilitato / disabilitato tutto in base al valore "isEnabled" - lbtShowSplitODL.Enabled = isEnabled; + lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio; lbtSplitODL.Enabled = isEnabled; chkCloseOdl.Enabled = isEnabled; fixWCtrStatus(lbtShowSplitODL); @@ -608,7 +619,7 @@ namespace MoonProTablet.WebUserControls /// private void fixSplitBtn(bool splitOdl) { - lbtShowSplitODL.Visible = !splitOdl; + lbtShowSplitODL.Visible = !splitOdl && enableRiattrezzaggio; chkCloseOdl.Visible = !splitOdl; lbtSplitODL.Visible = splitOdl; showNoteTC(splitOdl); @@ -846,8 +857,7 @@ namespace MoonProTablet.WebUserControls DataLayerObj.taODL.fixMachineSlave(idxMacchina, 30, 1); } // sistemo buttons! - bool splitOdl = false; - fixSplitBtn(splitOdl); + fixSplitBtn(false); } catch (Exception exc) { @@ -926,8 +936,7 @@ namespace MoonProTablet.WebUserControls /// protected void lbtShowSplitODL_Click(object sender, EventArgs e) { - bool splitOdl = true; - fixSplitBtn(splitOdl); + fixSplitBtn(true); // recupero current idx int currODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL; updateTempoTc(currODL, true); @@ -955,6 +964,12 @@ namespace MoonProTablet.WebUserControls // effettuo split su nuovo ODL DataLayerObj.taODL.splitODL(currODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCRichAttr, PzPallet, txtNote.Text, true, 0); + // se c'è gestione SchedaTecnica --> chiamo procedura update x lotti + if (enableSchedaTecnica) + { + int newODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL; + DataLayerObj.taMagELotti.UpsertByOdl(newODL, true); + } // resetto ODL su redis... DataLayerObj.emptyCurrODL(idxMacchinaFix); @@ -964,8 +979,7 @@ namespace MoonProTablet.WebUserControls // processo chiusura setup processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrato Riattrezzaggio ODL (old: {0})", currODL), currODL); // sistemo buttons! - bool splitOdl = false; - fixSplitBtn(splitOdl); + fixSplitBtn(false); // sollevo evento! if (eh_reqUpdate != null) @@ -1258,6 +1272,7 @@ namespace MoonProTablet.WebUserControls { mod_tempoMSMC.modoTempo = timeMode.MC; } + fixSplitBtn(false); } cmp_newODL.eh_newVal += Cmp_newODL_eh_newVal; } From b3f2b95013d09b7747b062290b322b45fffdeb7d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 5 Jan 2021 19:14:36 +0100 Subject: [PATCH 4/4] COmpletato fix compoertamento atrezzaggio ODL con scheda tecn --- MP-TAB/WebUserControls/mod_ODL.ascx | 2 +- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 6 ++++-- MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx b/MP-TAB/WebUserControls/mod_ODL.ascx index 4f69d8e8..febf465a 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx +++ b/MP-TAB/WebUserControls/mod_ODL.ascx @@ -92,7 +92,7 @@
- Scheda Tecnica incompleta!!! + Scheda Tecnica incompleta!!! FINE Attr / INIZIO Prod.
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index dffb2f84..fed7665a 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -498,12 +498,12 @@ namespace MoonProTablet.WebUserControls bool okCheckST = tabRichieste.Count == 0; if (okCheckST) { - lblNeedSTAR.Visible = false; + hlNeedStar.Visible = false; lbtStartProd.Enabled = (isEnabled && inAttr); } else { - lblNeedSTAR.Visible = (isEnabled && inAttr); + hlNeedStar.Visible = (isEnabled && inAttr); lbtStartProd.Enabled = false; } } @@ -1179,6 +1179,8 @@ namespace MoonProTablet.WebUserControls { lblOut.Text = "Selezionare un ORDINE valido!"; } + checkBtnStatus(); + fixSplitBtn(false); // sollevo evento! if (eh_reqUpdate != null) { diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs index 925bd22e..7f7f0528 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs @@ -222,13 +222,13 @@ namespace MoonProTablet.WebUserControls protected global::System.Web.UI.WebControls.LinkButton lbtReopOdlSuTav; /// - /// Controllo lblNeedSTAR. + /// Controllo hlNeedStar. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.Label lblNeedSTAR; + protected global::System.Web.UI.WebControls.HyperLink hlNeedStar; /// /// Controllo lbtStartProd.