diff --git a/Jenkinsfile b/Jenkinsfile index 7d3f7bc0..b75daea7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1368']) { + withEnv(['NEXT_BUILD_NUMBER=1369']) { // 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/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs index 5c1d41b4..7d0b92b6 100644 --- a/MP-MAG/Controllers/PrintQueueController.cs +++ b/MP-MAG/Controllers/PrintQueueController.cs @@ -74,6 +74,11 @@ namespace MP_MAG.Controllers answ.Add("stp_prt_CartellinoSemilavorati", tab); break; + case MagData.reportRichiesto.ReportPackList: + tab = MagDataLayerObj.taRepPL.GetData(keyParam); + answ.Add("stp_prt_ReportPackList", tab); + break; + default: break; } diff --git a/MP-MAG/Reports/queueConf.json b/MP-MAG/Reports/queueConf.json index ed8e74e3..2a2c8e15 100644 --- a/MP-MAG/Reports/queueConf.json +++ b/MP-MAG/Reports/queueConf.json @@ -88,5 +88,20 @@ "MarginBottom": "10mm", "xmlParam": "EMF148mm100mm10mm10mm10mm10mm" } + }, + { + "name": "POST_UFFICIO", + "template": "ReportPackList.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "210mm", + "PageWidth": "297mm", + "MarginLeft": "10mm", + "MarginRight": "10mm", + "MarginTop": "10mm", + "MarginBottom": "10mm", + "xmlParam": "EMF297mm210mm10mm10mm10mm10mm" + } } ] \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx index 3dc000c6..6ab280e5 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx @@ -13,7 +13,7 @@
- Report + Report
@@ -88,7 +88,12 @@