refs #4965 Added routeFk

print/templates/reports/collection-label/collection-label.html

@@ -21,7 +21,7 @@
                     <td id="outline" class="ellipsize">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td>
                 </tr>
                 <tr>
-                    <td><div id="agencyDescripton" class="ellipsize">{{labelData.agencyDescription ? labelData.agencyDescription.toUpperCase() : '---'}}</div></td>
+                    <td><div id="agencyDescripton" class="ellipsize">{{getAgencyDescripton(labelData)}}</div></td>
                     <td id="bold">{{labelData.lineCount || 0}}</td>
                 </tr>
                 <tr>

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()

print/templates/reports/collection-label/sql/labelsData.sql

@@ -14,7 +14,8 @@ SELECT c.itemPackingTypeFk code,
         DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
         tt.labelCount,
         t.nickName,
-		COUNT(*) lineCount
+        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