Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

db/routines/vn/procedures/expedition_getFromRoute.sql

@@ -16,7 +16,8 @@ BEGIN
 			a.nickname,
 			sub2.itemPackingTypeConcat,
 			est.code,
-			es.isScanned
+			es2.isScanned,
+			es2.scanOrder
 		FROM expedition e
 			JOIN ticket t ON t.id = e.ticketFk
 			JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@@ -38,6 +39,7 @@ BEGIN
 				    SELECT MAX(id)
 				    	FROM expeditionState es
 				    	WHERE expeditionFk = e.id)
+			LEFT JOIN expeditionState es2 ON es2.id = es.id
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END$$

db/routines/vn/procedures/travel_cloneWithEntries.sql

@@ -62,7 +62,7 @@ BEGIN
 		END IF;
 
 		CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
-        CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+		CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
 
 		SELECT evaNotes INTO vEvaNotes
 			FROM entry
@@ -71,6 +71,8 @@ BEGIN
 		UPDATE entry
 			SET evaNotes = vEvaNotes
 			WHERE id = vNewEntryFk;
+		
+		CALL buy_recalcPricesByEntry(vNewEntryFk);
 	END LOOP;
 
 	SET @isModeInventory = FALSE;

db/versions/11319-redEucalyptus/00-firstScript.sql

@@ -0,0 +1,3 @@
+USE vn;
+
+ALTER TABLE vn.expeditionState ADD scanOrder int(11) DEFAULT NULL NULL COMMENT 'Indica la posición al cargar la furgoneta';

modules/ticket/back/methods/expedition-state/addExpeditionState.js

@@ -44,6 +44,7 @@ module.exports = Self => {
 
                 const typeFk = expeditionStateType.id;
                 expeditionId = expedition.expeditionFk;
+                expeditionPosition = expedition?.scanOrder ?? null;
                 const isScannedExpedition = expedition.isScanned ?? false;
 
                 await models.ExpeditionState.create({
@@ -51,6 +52,7 @@ module.exports = Self => {
                     typeFk,
                     userFk: userId,
                     isScanned: isScannedExpedition,
+                    scanOrder: expeditionPosition
                 }, myOptions);
             }
 

modules/ticket/back/models/expedition-state.json

@@ -27,6 +27,9 @@
         },
         "isScanned": {
             "type": "boolean"
+        },
+        "scanOrder": {
+            "type": "number"
         }
     },
     "relations": {