From a14bf64b148cdf57933570973544d8156a6527ea Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 10:54:01 +0200 Subject: [PATCH 1/7] start new release --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e093cee..57e4f4e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=307']) { + withEnv(['NEXT_BUILD_NUMBER=308']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From 54011c71f554badce8e705a4653d9eb4a0e5f8d6 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 10:54:21 +0200 Subject: [PATCH 2/7] fix refresh KIT page problem --- NKC_WF/site/Kitting.aspx | 2 +- NKC_WF/site/Kitting.aspx.designer.cs | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NKC_WF/site/Kitting.aspx b/NKC_WF/site/Kitting.aspx index b3a30dc..087a444 100644 --- a/NKC_WF/site/Kitting.aspx +++ b/NKC_WF/site/Kitting.aspx @@ -6,9 +6,9 @@ - +
diff --git a/NKC_WF/site/Kitting.aspx.designer.cs b/NKC_WF/site/Kitting.aspx.designer.cs index c2cbc7b..4304ba1 100644 --- a/NKC_WF/site/Kitting.aspx.designer.cs +++ b/NKC_WF/site/Kitting.aspx.designer.cs @@ -14,15 +14,6 @@ namespace NKC_WF.site public partial class Kitting { - /// - /// Controllo timerKitting. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.Timer timerKitting; - /// /// Controllo UpdatePanel2. /// @@ -32,6 +23,15 @@ namespace NKC_WF.site /// protected global::System.Web.UI.UpdatePanel UpdatePanel2; + /// + /// Controllo timerKitting. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerKitting; + /// /// Controllo cmp_kitRunning. /// From 3487e7a28568f6e4b3807374849fe5e5e24fa4f9 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 10:54:27 +0200 Subject: [PATCH 3/7] update part report --- NKC_WF/Reports/Part.rdlc | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/NKC_WF/Reports/Part.rdlc b/NKC_WF/Reports/Part.rdlc index 643fb85..d7625fa 100644 --- a/NKC_WF/Reports/Part.rdlc +++ b/NKC_WF/Reports/Part.rdlc @@ -6,19 +6,18 @@ - 2in + 3.9in - 0.99in + 1.9in - true true @@ -27,7 +26,7 @@ =First(Fields!Destination.Value) @@ -38,10 +37,10 @@ Destination - 0.254cm - 2.33539cm - 0.8in - 1.05555in + 0.73025cm + 3.7cm + 1.3in + 2.44331in @@ -64,10 +63,10 @@ 'https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}','parameters':['VARIABILE']} FitProportional - 0.1in - 0.05in - 0.8in - 0.8in + 0.2875in + 0.1in + 1.3in + 1.3in 1 - 0.99in + 1.9in