From a3f05ea0533a32af5436afafcf590eb912a2418e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 9 Mar 2021 17:17:57 +0100 Subject: [PATCH] fix pulsanti riattrezzaggio --- Jenkinsfile | 2 +- MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs | 2 +- MP-TAB/WebUserControls/mod_ODL.ascx.cs | 3 ++- MagData/DS_PackList.Designer.cs | 2 +- MagData/DS_PackList.xsd | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 072c7858..cc35c48a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1402']) { + withEnv(['NEXT_BUILD_NUMBER=1403']) { // env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.13.${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-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs b/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs index 498e8a0b..1c213a30 100644 --- a/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs @@ -72,7 +72,7 @@ namespace MP_MAG.WebUserControls var ordiniCaricati = tabOrdiniCaricati.Where(x => x.ExtOrdCod == keySel); if (ordiniCaricati.ToList().Count == 0) { - MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.Qta, rigaOrd.CodCliente, rigaOrd.DescDestinazione); + MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.Qta, rigaOrd.CodCliente, rigaOrd.CodDestinazione); } raiseAddNew(); } diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index 8754bb6f..aef850a3 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -677,7 +677,7 @@ namespace MoonProTablet.WebUserControls divNote.Visible = show; divPzPallet.Visible = show; lbtStartAttr.Visible = show; - lbtShowOdlDet.Visible = !lbtStartAttr.Visible; + lbtShowOdlDet.Visible = !show; cmp_dettPODL.idxODLSel = idxODLSel; divDettPOdl.Visible = show && idxODLSel > 0; // se abilitato da config su DB mostro selezione del numPzPallet... @@ -1266,6 +1266,7 @@ namespace MoonProTablet.WebUserControls } // fix buttons fixSplitBtn(false); + checkTcNote(); } cmp_newODL.eh_newVal += Cmp_newODL_eh_newVal; cmp_selPODL.eh_doUpdate += Cmp_selPODL_eh_doUpdate; diff --git a/MagData/DS_PackList.Designer.cs b/MagData/DS_PackList.Designer.cs index b5d0c3c9..c2832b14 100644 --- a/MagData/DS_PackList.Designer.cs +++ b/MagData/DS_PackList.Designer.cs @@ -1433,7 +1433,7 @@ namespace MagData { this.columnCodCliente.MaxLength = 50; this.columnCodDestinazione.MaxLength = 50; this.columnDescDestinazione.ReadOnly = true; - this.columnDescDestinazione.MaxLength = 858; + this.columnDescDestinazione.MaxLength = 1500; this.columnUM.MaxLength = 250; this.columnQta.AllowDBNull = false; this.columnQtaEvadibile.AllowDBNull = false; diff --git a/MagData/DS_PackList.xsd b/MagData/DS_PackList.xsd index f008af52..5876df7e 100644 --- a/MagData/DS_PackList.xsd +++ b/MagData/DS_PackList.xsd @@ -358,7 +358,7 @@ - +