diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index d0d215900..36fcc00d4 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2348,4 +2348,25 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`) (1, 1, 1), (2, 1, 2), (3, 6, 5), - (4, 7, 1); \ No newline at end of file + (4, 7, 1); + +INSERT INTO `vn`.`expeditionTruck` (`id`, `ETD`, `description`) + VALUES + (1, CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL +3 YEAR))), 'Best truck in fleet'); + +INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPrint`) + VALUES + (1, 1, CURDATE(), 1, 1); + +INSERT INTO `vn`.`expeditionScan` (`id`, `expeditionFk`, `scanned`, `palletFk`) + VALUES + (1, 1, CURDATE(), 1), + (2, 2, CURDATE(), 1), + (3, 3, CURDATE(), 1), + (4, 4, CURDATE(), 1), + (5, 5, CURDATE(), 1), + (6, 6, CURDATE(), 1), + (7, 7, CURDATE(), 1), + (8, 8, CURDATE(), 1), + (9, 9, CURDATE(), 1), + (10, 10, CURDATE(), 1); \ No newline at end of file diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js index 79c7131ea..96884d3c3 100644 --- a/modules/ticket/back/methods/expedition/filter.js +++ b/modules/ticket/back/methods/expedition/filter.js @@ -39,14 +39,19 @@ module.exports = Self => { e.externalId, i3.name packagingName, i3.id packagingItemFk, - e.packagingFk + e.packagingFk, + es.workerFk expeditionScanWorkerFk, + su.nickname scannerUserNickname, + es.scanned FROM vn.expedition e - LEFT JOIN vn.item i2 ON i2.id = e.itemFk + LEFT JOIN vn.item i2 ON i2.id = e.itemFk INNER JOIN vn.item i1 ON i1.id = e.isBox LEFT JOIN vn.packaging p ON p.id = e.packagingFk LEFT JOIN vn.item i3 ON i3.id = p.itemFk LEFT JOIN account.user u ON u.id = e.workerFk + LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id + LEFT JOIN account.user su ON su.id = es.workerFk `); stmt.merge(Self.buildSuffix(filter, 'e')); diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html index e4d42d62e..64f8b0958 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -19,8 +19,10 @@ Package type Counter externalId - Worker + Packager Created + Scanned + Palletizer @@ -51,6 +53,12 @@ {{::expedition.created | date:'dd/MM/yyyy HH:mm'}} + {{::expedition.scanned | date:'dd/MM/yyyy HH:mm'}} + + + {{::expedition.scannerUserNickname | dashIfEmpty}} + + diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml index 02cab50ed..6e502ed7d 100644 --- a/modules/ticket/front/locale/es.yml +++ b/modules/ticket/front/locale/es.yml @@ -78,4 +78,6 @@ Sale checked: Control clientes Components: Componentes Sale tracking: LĂ­neas preparadas Pictures: Fotos -Log: Historial \ No newline at end of file +Log: Historial +Packager: Encajador +Palletizer: Palletizador \ No newline at end of file