diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js index b8c634553..74c542806 100644 --- a/modules/ticket/back/methods/expedition/filter.js +++ b/modules/ticket/back/methods/expedition/filter.js @@ -25,23 +25,17 @@ module.exports = Self => { Self.filter = async filter => { const stmt = new ParameterizedSQL( `SELECT - e.id, - e.ticketFk, - e.isBox, - i1.name namePackage, - e.counter, - e.checked, - i2.name nameBox, - e.itemFk, - u.nickname userNickname, - u.id userId, - e.created + e.id, e.ticketFk, e.isBox, + i1.name namePackage, e.counter, + e.checked, i2.name nameBox, + e.itemFk, u.nickname userNickname, + u.id userId, e.created, e.externalId FROM vn.expedition e LEFT JOIN vn.item i2 ON i2.id = e.itemFk INNER JOIN vn.item i1 ON i1.id = e.isBox LEFT JOIN vn.worker w ON w.id = e.workerFk - JOIN account.user u ON u.id = w.id + JOIN account.user u ON u.id = w.userFk `); stmt.merge(Self.buildSuffix(filter, 'e')); diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html index 1b713a9e6..d10a4bdcb 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -13,6 +13,8 @@ + Expedition + Envialia Item Name Package type @@ -30,6 +32,8 @@ vn-tooltip="Delete expedition"> + {{expedition.id | zeroFill:6}} + {{expedition.externalId | zeroFill:6}} {{::expedition.nameBox}} {{::expedition.counter}} {{::expedition.checked}} - {{::expedition.userNickname}}