solve merge conficts

modules/route/back/methods/route/getTickets.js

@@ -32,37 +32,37 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const stmt = new ParameterizedSQL(
-            `SELECT DISTINCT
-                    t.id,
-                    t.packages,
-                    t.warehouseFk,
-                    t.nickname,
-                    t.clientFk,
-                    t.priority,
-                    t.addressFk,
-                    st.code AS ticketStateCode,
-                    st.name AS ticketStateName,
-                    wh.name AS warehouseName,
-                    tob.description AS ticketObservation,
-                    a.street,
-                    a.postalCode,
-                    a.city,
-                    am.name AS agencyModeName,
-                    u.nickname AS userNickname,
-                    vn.ticketTotalVolume(t.id) AS volume,
-                    tob.description
-                FROM route r
-                    JOIN ticket t ON t.routeFk = r.id
-                    LEFT JOIN ticketState ts ON ts.ticketFk = t.id
-                    LEFT JOIN state st ON st.id = ts.stateFk
-                    LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
-                    LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
-                    LEFT JOIN observationType ot ON tob.observationTypeFk = ot.id
-                        AND ot.code = 'delivery'
-                    LEFT JOIN address a ON a.id = t.addressFk
-                    LEFT JOIN agencyMode  am ON am.id = t.agencyModeFk
-                    LEFT JOIN account.user u ON u.id = r.workerFk
-                    LEFT JOIN vehicle v ON v.id = r.vehicleFk`
+            `SELECT
+            t.id,
+            t.packages,
+            t.warehouseFk,
+            t.nickname,
+            t.clientFk,
+            t.priority,
+            t.addressFk,
+            st.code AS ticketStateCode,
+            st.name AS ticketStateName,
+            wh.name AS warehouseName,
+            tob.description AS ticketObservation,
+            a.street,
+            a.postalCode,
+            a.city,
+            am.name AS agencyModeName,
+            u.nickname AS userNickname,
+            vn.ticketTotalVolume(t.id) AS volume,
+            tob.description
+        FROM vn.route r
+            JOIN ticket t ON t.routeFk = r.id
+            LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+            LEFT JOIN state st ON st.id = ts.stateFk
+            LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
+            LEFT JOIN observationType ot ON ot.code = 'delivery'
+            LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id 
+                AND tob.observationTypeFk = ot.id
+            LEFT JOIN address a ON a.id = t.addressFk
+            LEFT JOIN agencyMode  am ON am.id = t.agencyModeFk
+            LEFT JOIN account.user u ON u.id = r.workerFk
+            LEFT JOIN vehicle v ON v.id = r.vehicleFk`
         );
 
         if (!filter.where) filter.where = {};