Merge branch 'dev' into 2951-fix_unit_test

db/dump/fixtures.sql

@@ -2349,3 +2349,24 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
         (2,  1,  2),
         (3,  6,  5),
         (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);

modules/ticket/back/methods/expedition/filter.js

@@ -39,7 +39,10 @@ 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
@@ -47,6 +50,8 @@ module.exports = Self => {
                 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'));
 

modules/ticket/front/expedition/index.html

@@ -19,8 +19,10 @@
                 <vn-th field="isBox">Package type</vn-th>
                 <vn-th field="counter" number>Counter</vn-th>
                 <vn-th field="externalId" number>externalId</vn-th>
-                <vn-th field="worker">Worker</vn-th>
+                <vn-th field="worker">Packager</vn-th>
                 <vn-th field="created" expand>Created</vn-th>
+                <vn-th field="scanned" expand>Scanned</vn-th>
+                <vn-th field="expeditionScanWorkerFk">Palletizer</vn-th>
             </vn-tr>
         </vn-thead>
         <vn-tbody>
@@ -51,6 +53,12 @@
                     </span>
                 </vn-td>
                 <vn-td expand>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td expand>{{::expedition.scanned | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td expand>
+                    <span class="link" ng-click="workerDescriptor.show($event, expedition.expeditionScanWorkerFk)">
+                        {{::expedition.scannerUserNickname | dashIfEmpty}}
+                    </span>
+                </vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>

modules/ticket/front/locale/es.yml

@@ -79,3 +79,5 @@ Components: Componentes
 Sale tracking: Líneas preparadas
 Pictures: Fotos
 Log: Historial
+Packager: Encajador
+Palletizer: Palletizador