diff --git a/print/templates/reports/collection-label/collection-label.html b/print/templates/reports/collection-label/collection-label.html
index 2fd77079f..a699d4ac5 100644
--- a/print/templates/reports/collection-label/collection-label.html
+++ b/print/templates/reports/collection-label/collection-label.html
@@ -21,7 +21,7 @@
{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}} |
- {{labelData.agencyDescription ? labelData.agencyDescription.toUpperCase() : '---'}} |
+ {{getAgencyDescripton(labelData)}} |
{{labelData.lineCount || 0}} |
diff --git a/print/templates/reports/collection-label/collection-label.js b/print/templates/reports/collection-label/collection-label.js
index e73afaeea..e7da3842f 100644
--- a/print/templates/reports/collection-label/collection-label.js
+++ b/print/templates/reports/collection-label/collection-label.js
@@ -61,6 +61,18 @@ module.exports = {
return value;
},
+ getAgencyDescripton(labelData) {
+ let value;
+ if (labelData.agencyDescription)
+ value = labelData.agencyDescription.toUpperCase().substring(0, 11);
+ else
+ value = '---';
+
+ if (labelData.routeFk)
+ value = `${value} [${labelData.routeFk.toString().substring(0, 3)}]`;
+
+ return value;
+ },
},
components: {
'report-body': reportBody.build()
diff --git a/print/templates/reports/collection-label/sql/labelsData.sql b/print/templates/reports/collection-label/sql/labelsData.sql
index 1846c6893..29ea36562 100644
--- a/print/templates/reports/collection-label/sql/labelsData.sql
+++ b/print/templates/reports/collection-label/sql/labelsData.sql
@@ -1,37 +1,38 @@
SELECT c.itemPackingTypeFk code,
- tc.collectionFk,
- SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
- tc.`level`,
- t.id ticketFk,
- COALESCE(et.description, zo.name, am.name) agencyDescription,
- cc.code color,
- t.clientFk,
- CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
- MAX(i.`size`) `size`,
- w.code workerCode,
- TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
- TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
- DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
- tt.labelCount,
- t.nickName,
- COUNT(*) lineCount
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
- AND cc.wagon = tc.wagon
- AND cc.trainFk = c.trainFk
- JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- JOIN vn.worker w ON w.id = c.workerFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
- LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
- LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
- LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
- WHERE t.id IN (?)
- GROUP BY t.id
- ORDER BY cc.`code`;
\ No newline at end of file
+ tc.collectionFk,
+ SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
+ tc.`level`,
+ t.id ticketFk,
+ COALESCE(et.description, zo.name, am.name) agencyDescription,
+ cc.code color,
+ t.clientFk,
+ CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
+ MAX(i.`size`) `size`,
+ w.code workerCode,
+ TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
+ TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
+ DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
+ tt.labelCount,
+ t.nickName,
+ COUNT(*) lineCount,
+ rm.routeFk
+ FROM vn.ticket t
+ JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
+ AND cc.wagon = tc.wagon
+ AND cc.trainFk = c.trainFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ JOIN vn.worker w ON w.id = c.workerFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
+ LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+ WHERE t.id IN (?)
+ GROUP BY t.id
+ ORDER BY cc.`code`;