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}') 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