From 85f6f00adb9734ab8fec662a5fef6c9bb72d6266 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 20 Aug 2020 11:17:45 +0200 Subject: [PATCH 01/13] new rel + fix jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6532e2a..bd00267 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=349']) { + withEnv(['NEXT_BUILD_NUMBER=350']) { // 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}') @@ -20,7 +20,7 @@ pipeline { } script { currentBuild.displayName = "${env.versionNumber}" - if (env.BRANCH_NAME == "develop" || env.BRANCH_NAME.contains("DEMO")) { + if (env.BRANCH_NAME == "develop" || env.BRANCH_NAME.contains("DEMO") || env.BRANCH_NAME.contains("report")) { currentBuild.description = "TEST ${env.versionNumber}" } else { From af130b77d47eef2c76dd30c279435bda2bf35899 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 20 Aug 2020 11:54:06 +0200 Subject: [PATCH 02/13] Aggiunta nuovo rdlc --- NKC_WF/Reports/OtherPart.rdlc | 287 ++++++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 NKC_WF/Reports/OtherPart.rdlc diff --git a/NKC_WF/Reports/OtherPart.rdlc b/NKC_WF/Reports/OtherPart.rdlc new file mode 100644 index 0000000..f394295 --- /dev/null +++ b/NKC_WF/Reports/OtherPart.rdlc @@ -0,0 +1,287 @@ + + + v. 2.1.1 + 0 + + + Sauder_NKC + 7e875094-37e0-46d4-8db0-d51955773fb0 + + + + + + Sauder_NKC + + + =Parameters!OtherItemID.Value + + + =Parameters!QRCodeBaseUrl.Value + + + StoredProcedure + prt.stp_prt_OtherPart + true + + + + OtherItemID + System.Int32 + + + OtherItemExtCode + System.String + + + OtherItemDesc + System.String + + + OtherItemDtmx + System.String + + + QRCodeBaseUrl + System.String + + + OtherItemType + System.String + + + OtherItemNote + System.String + + + + + + + + + + + + + 3.9in + + + + + 1.9in + + + + + + + true + + + + + =First(Fields!OtherItemExtCode.Value) + + + + + + + Destination + 0.73025cm + 3.7cm + 0.425in + 2.44331in + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + External + =Replace(Fields!QRCodeBaseUrl.Value.ToString(),"QRCODEVALUE",Fields!OtherItemDtmx.Value.ToString()) + +' la stringa nel Campo è https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':\['QRCODEVALUE'\]} +' dove la \ prima della [ serve perchè è una stringa quindi si trasforma poi in +' https://qrcode.steamware.net/HOME/QR_site/JSON?val={'baseUrl':'{0}','parameters':['QRCODEVALUE']} + + +'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.2875in + 0.1in + 1.3in + 1.3in + 1 + + + + + + true + + + + + =First(Fields!OtherItemDesc.Value) + + + + + + + Destination + 1.98614cm + 3.66183cm + 0.80556in + 2.44331in + 2 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + + 0.5pt + + + Gray + + 0.5pt + + + Gray + + 0.5pt + + + Gray + + 0.5pt + + + Gray + + 0.5pt + + + + + + + + + + + + + + + + + + + + =Fields!OtherItemID.Value + + + Output + true + + + + stp_prt_OtherPart + + End + + 1.9in + 3.9in + + + + 1.9in +