diff --git a/Jenkinsfile b/Jenkinsfile index 695c26ad..685da752 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1380']) { + withEnv(['NEXT_BUILD_NUMBER=1382']) { // 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-MAG/Controllers/PrintQueueConfController.cs b/MP-MAG/Controllers/PrintQueueConfController.cs index 39385aec..a78b0439 100644 --- a/MP-MAG/Controllers/PrintQueueConfController.cs +++ b/MP-MAG/Controllers/PrintQueueConfController.cs @@ -9,7 +9,7 @@ namespace MP_MAG.Controllers { /// /// Restituisce un array JSon x le conf delle code di stampa - /// GET: api/PrintQueue + /// GET: api/PrintQueueConf /// /// lista oggetto Json in formato SteamwareSDK.queueConf public List Get() diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 896477c6..c32836b2 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -471,6 +471,13 @@ cmp_jumper.ascx + + cmp_listODL.ascx + ASPXCodeBehind + + + cmp_listODL.ascx + cmp_menuTop.ascx ASPXCodeBehind @@ -814,6 +821,7 @@ + diff --git a/MP-MAG/Reports/CartellinoFinitiOdette.rdlc b/MP-MAG/Reports/CartellinoFinitiOdette.rdlc index 8858eb8e..c9adcb7b 100644 --- a/MP-MAG/Reports/CartellinoFinitiOdette.rdlc +++ b/MP-MAG/Reports/CartellinoFinitiOdette.rdlc @@ -1,5 +1,1415 @@  - + + + + + + + + 19cm + + + + + 12.8cm + + + + + + + + + + + true + + + + + =Fields!Campo1_2.Value + + + + + + + true + + + + + =Fields!Campo1_1.Value + + + + + + + true + + + + + =Fields!Campo1_3.Value + + + + + + + true + + + + + =Fields!Campo1_4.Value + + + + + + + ContentsOnly + 0.1cm + 1.9cm + 9.2cm + + + + + + + true + + + + + =Fields!Campo2_4.Value + + + + + + + true + + + + + =Fields!Campo2_2.Value + + + + + + + true + + + + + =Fields!Campo2_3.Value + + + + + + + ContentsOnly + 9.4cm + 1.9cm + 9.5cm + 1 + + 0.5pt + + + + + 6.4cm + 0cm + 19cm + 3 + + 0.5pt + + + + + 1.9cm + 0cm + 19cm + 4 + + 0.5pt + + + + + 3.9cm + 9.4cm + -3.89577cm + 0cm + 5 + + 0.5pt + + + + + 12.8cm + 9.4cm + -6.4cm + 0cm + 6 + + 0.5pt + + + + + 8.8cm + 0cm + 9.37989cm + 7 + + 0.5pt + + + + + 10.8cm + 0cm + 9.37989cm + 8 + + 0.5pt + + + + + 7.6cm + 9.4cm + 0cm + 9.6cm + 9 + + 0.5pt + + + + + 10.8cm + 9.4cm + 0cm + 9.6cm + 10 + + 0.5pt + + + + + 9.5cm + 9.4cm + 0cm + 9.6cm + 11 + + 0.5pt + + + + + true + + + + + =Fields!Campo3_1.Value + + + + + + + 2.9cm + 9.4cm + 0cm + 9.6cm + 13 + + 0.5pt + + + + + true + + + + + =Fields!Campo4_1.Value + + + + + + + true + + + + + =Fields!Campo5_1.Value + + + + + + + true + + + + + =Fields!Campo3_2.Value + + + + + + + true + + + + + =Fields!Campo4_2.Value + + + + + + + textbox7 + 2.2cm + 9.5cm + 0.55889cm + 9.4cm + 17 + + + + true + + + + + =Fields!Campo8_1.Value + + + + + + + true + + + + + =Fields!Campo8_2.Value + + + + + + + 3.97cm + 2.8cm + 1cm + 13.2cm + 19 + + + Top + 0.5pt + 0.5pt + + + + true + + + + + =Fields!Campo9_1.Value + + + + + + + true + + + + + =Fields!Campo9_2.Value + + + + + + + 6.4cm + 2.39688cm + 0.84125cm + 6.70312cm + 21 + + + + true + + + + + =Fields!Campo10_1.Value + + + + + + + true + + + + + =Fields!Campo10_2.Value + + + + + + + true + + + + + =Fields!Campo13_1.Value + + + + + + + true + + + + + =Fields!Campo13_2.Value + + + + + + + 9.9cm + 9.4cm + 0.8cm + 3.5cm + 25 + + + + 9.5cm + 13cm + 1.3cm + 0cm + 26 + + 0.5pt + + + + + 3.9cm + 12.6cm + -1cm + 0cm + 27 + + 0.5pt + + + + + 3.9cm + 16.2cm + -1cm + 0cm + 28 + + 0.5pt + + + + + true + + + + + =Fields!Campo6_1.Value + + + + + + + true + + + + + =Fields!Campo7_1.Value + + + + + + + true + + + + + =Fields!Campo11_2_1.Value + + + + + + + true + + + + + =Fields!Campo14_1.Value + + + + + + + true + + + + + =Fields!Campo16_1.Value + + + + + + + true + + + + + =Fields!Campo15_1.Value + + + + + + + true + + + + + =Fields!Campo12_1.Value + + + + + + + true + + + + + =Fields!Campo12_2.Value + + + + + + + Campo12_2 + 8.8cm + 2.8cm + 0.6cm + 6.3cm + 36 + + + + true + + + + + =Fields!Campo15_2.Value + + + + + + + Campo15_2 + 10.8cm + 3.6923cm + 0.6cm + 5.40771cm + 37 + + + + true + + + + + =Fields!Campo16_2.Value + + + + + + + Campo16_2 + 10.8cm + 13.80827cm + 0.6cm + 5.09173cm + 38 + + + + true + + + + + =Fields!Campo14_2.Value + + + + + + + true + + + + + =Fields!Campo11_2_2.Value + + + + + + + Campo11_2_2 + 8.07639cm + 10.95375cm + 1.22361cm + 6.2cm + 40 + + + + true + + + + + =Fields!Campo5_2.Value + + + + + + + Campo5_2 + 3.2cm + 9.5cm + 0.7cm + 3cm + 41 + + + + true + + + + + =Fields!Campo6_2.Value + + + + + + + Campo6_2 + 3.2cm + 12.7cm + 0.7cm + 3.4cm + 42 + + + + true + + + + + =Fields!Campo7_2.Value + + + + + + + Campo7_2 + 3.2cm + 16.3cm + 0.7cm + 2.6cm + 43 + + + + External + =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo8_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value + +'=Parameters!QRCodeBaseURL.Value.ToString() & ":['" & Fields!StackID.Value.ToString() & "']}" + FitProportional + 5.1cm + 2.8cm + 1.2cm + 13.2cm + 44 + + =iif(Fields!Campo8_3.Value="",True,False) + + + + + + + External + =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo15_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value + FitProportional + 11.5cm + 0.6cm + 1.2cm + 8.4cm + 45 + + =iif(Fields!Campo15_3.Value="",True,False) + + + + + + + External + =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo12_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value + FitProportional + 9.5cm + 0.6cm + 1.2cm + 8.4cm + 46 + + =iif(Fields!Campo12_3.Value="",True,False) + + + + + + + External + =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo16_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value + FitProportional + 11.5cm + 9.94979cm + 1.2cm + 8.4cm + 47 + + =iif(Fields!Campo16_3.Value="",True,False) + + + + + + + External + =Replace(Fields!BarcodeBaseUrl.Value.ToString(), "BARCODE", Fields!Campo9_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value +' "?showVal=false&h=" + Parameters!BarcodeHeight.Value non mostra valore sotto barcode e definisce altezza Barcode da services + FitProportional + 7.41764cm + 0.6cm + 1.2cm + 8.4cm + 48 + + =iif(Fields!Campo9_3.Value = "", True, False) + + + + + + + External + =Replace(Fields!BarcodeBaseUrl.Value.ToString(), "BARCODE", Fields!Campo3_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value + FitProportional + 2.6cm + 0.6cm + 1.2cm + 8.4cm + 49 + + =iif(Fields!Campo3_3.Value = "", True, False) + + + + + + + ContentsOnly + 12.8cm + 19cm + + + + + + true + + + + 12.8cm + - - - - - - true - - - - - =Fields!Campo1_1.Value - - - - - - - true - - - - - =Fields!Campo1_3.Value - - - - - - - true - - - - - =Fields!Campo1_4.Value - - - - - - - ContentsOnly - 0.1cm - 1.9cm - 9.2cm - - - - - - - true - - - - - =Fields!Campo2_4.Value - - - - - - - true - - - - - =Fields!Campo2_2.Value - - - - - - - true - - - - - =Fields!Campo2_3.Value - - - - - - - ContentsOnly - 9.4cm - 1.9cm - 9.5cm - 1 - - 0.5pt - - - - - 6.4cm - 0cm - 19cm - 3 - - 0.5pt - - - - - 1.9cm - 0cm - 19cm - 4 - - 0.5pt - - - - - 3.9cm - 9.4cm - -3.89577cm - 0cm - 5 - - 0.5pt - - - - - 12.8cm - 9.4cm - -6.4cm - 0cm - 6 - - 0.5pt - - - - - 8.8cm - 0cm - 9.37989cm - 7 - - 0.5pt - - - - - 10.8cm - 0cm - 9.37989cm - 8 - - 0.5pt - - - - - 7.6cm - 9.4cm - 0cm - 9.6cm - 9 - - 0.5pt - - - - - 10.8cm - 9.4cm - 0cm - 9.6cm - 10 - - 0.5pt - - - - - 9.5cm - 9.4cm - 0cm - 9.6cm - 11 - - 0.5pt - - - - - true - - - - - =Fields!Campo3_1.Value - - - - - - - 2.9cm - 9.4cm - 0cm - 9.6cm - 13 - - 0.5pt - - - - - true - - - - - =Fields!Campo4_1.Value - - - - - - - true - - - - - =Fields!Campo5_1.Value - - - - - - - true - - - - - =Fields!Campo3_2.Value - - - - - - - true - - - - - =Fields!Campo4_2.Value - - - - - - - textbox7 - 2.2cm - 9.5cm - 0.55889cm - 9.4cm - 17 - - - - true - - - - - =Fields!Campo8_1.Value - - - - - - - true - - - - - =Fields!Campo8_2.Value - - - - - - - 3.97cm - 2.8cm - 1cm - 13.2cm - 19 - - - Top - 0.5pt - 0.5pt - - - - true - - - - - =Fields!Campo9_1.Value - - - - - - - true - - - - - =Fields!Campo9_2.Value - - - - - - - 6.4cm - 2.39688cm - 0.84125cm - 6.70312cm - 21 - - - - true - - - - - =Fields!Campo10_1.Value - - - - - - - true - - - - - =Fields!Campo10_2.Value - - - - - - - true - - - - - =Fields!Campo13_1.Value - - - - - - - true - - - - - =Fields!Campo13_2.Value - - - - - - - 9.9cm - 9.4cm - 0.8cm - 3.5cm - 25 - - - - 9.5cm - 13cm - 1.3cm - 0cm - 26 - - 0.5pt - - - - - 3.9cm - 12.6cm - -1cm - 0cm - 27 - - 0.5pt - - - - - 3.9cm - 16.2cm - -1cm - 0cm - 28 - - 0.5pt - - - - - true - - - - - =Fields!Campo6_1.Value - - - - - - - true - - - - - =Fields!Campo7_1.Value - - - - - - - true - - - - - =Fields!Campo11_2_1.Value - - - - - - - true - - - - - =Fields!Campo14_1.Value - - - - - - - true - - - - - =Fields!Campo16_1.Value - - - - - - - true - - - - - =Fields!Campo15_1.Value - - - - - - - true - - - - - =Fields!Campo12_1.Value - - - - - - - true - - - - - =Fields!Campo12_2.Value - - - - - - - Campo12_2 - 8.8cm - 2.8cm - 0.6cm - 6.3cm - 36 - - - - true - - - - - =Fields!Campo15_2.Value - - - - - - - Campo15_2 - 10.8cm - 3.6923cm - 0.6cm - 5.40771cm - 37 - - - - true - - - - - =Fields!Campo16_2.Value - - - - - - - Campo16_2 - 10.8cm - 13.80827cm - 0.6cm - 5.09173cm - 38 - - - - true - - - - - =Fields!Campo14_2.Value - - - - - - - true - - - - - =Fields!Campo11_2_2.Value - - - - - - - Campo11_2_2 - 8.07639cm - 10.95375cm - 1.22361cm - 6.2cm - 40 - - - - true - - - - - =Fields!Campo5_2.Value - - - - - - - Campo5_2 - 3.2cm - 9.5cm - 0.7cm - 3cm - 41 - - - - true - - - - - =Fields!Campo6_2.Value - - - - - - - Campo6_2 - 3.2cm - 12.7cm - 0.7cm - 3.4cm - 42 - - - - true - - - - - =Fields!Campo7_2.Value - - - - - - - Campo7_2 - 3.2cm - 16.3cm - 0.7cm - 2.6cm - 43 - - - - External - =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo8_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value - -'=Parameters!QRCodeBaseURL.Value.ToString() & ":['" & Fields!StackID.Value.ToString() & "']}" - FitProportional - 5.1cm - 2.8cm - 1.2cm - 13.2cm - 44 - - =iif(Fields!Campo8_3.Value="",True,False) - - - - - - - External - =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo15_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value - FitProportional - 11.5cm - 0.6cm - 1.2cm - 8.4cm - 45 - - =iif(Fields!Campo15_3.Value="",True,False) - - - - - - - External - =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo12_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value - FitProportional - 9.5cm - 0.6cm - 1.2cm - 8.4cm - 46 - - =iif(Fields!Campo12_3.Value="",True,False) - - - - - - - External - =Replace(Fields!BarcodeBaseUrl.Value.ToString(),"BARCODE",Fields!Campo16_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value - FitProportional - 11.5cm - 9.94979cm - 1.2cm - 8.4cm - 47 - - =iif(Fields!Campo16_3.Value="",True,False) - - - - - - - External - =Replace(Fields!BarcodeBaseUrl.Value.ToString(), "BARCODE", Fields!Campo9_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value -' "?showVal=false&h=" + Parameters!BarcodeHeight.Value non mostra valore sotto barcode e definisce altezza Barcode da services - FitProportional - 7.41764cm - 0.6cm - 1.2cm - 8.4cm - 48 - - =iif(Fields!Campo9_3.Value = "", True, False) - - - - - - - External - =Replace(Fields!BarcodeBaseUrl.Value.ToString(), "BARCODE", Fields!Campo3_3.Value.ToString()) + "?showVal=false&h=" + Parameters!BarcodeHeight.Value - FitProportional - 2.6cm - 0.6cm - 1.2cm - 8.4cm - 49 - - =iif(Fields!Campo3_3.Value = "", True, False) - - - - - - - ContentsOnly - 12.8cm - 19cm - - - - - - true - - - - 12.8cm -