From 72bab95be186b12bf2edb226a9ab6711ce68bdfc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 07:52:13 +0200
Subject: [PATCH] fix: refs #7781 leave early before any updates on the proc

---
 .../vn/procedures/expeditionPallet_build.sql  | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/db/routines/vn/procedures/expeditionPallet_build.sql b/db/routines/vn/procedures/expeditionPallet_build.sql
index 766064a5b..cffa42633 100644
--- a/db/routines/vn/procedures/expeditionPallet_build.sql
+++ b/db/routines/vn/procedures/expeditionPallet_build.sql
@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionPallet_bu
 	vWorkerFk INT,
 	OUT vPalletFk INT
 )
-BEGIN
+proc: BEGIN
 /** 
  * Builds an expedition pallet.
  *
@@ -56,6 +56,17 @@ BEGIN
 		FROM tExpedition 
 		WHERE palletFk;
 
+	IF vExpeditionWithPallet THEN
+		UPDATE arcRead 
+			SET error = (
+				SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ')
+					FROM tExpedition 
+					WHERE palletFk
+			)
+		WHERE id = vArcId;
+		LEAVE proc;
+	END IF;
+
 	IF NOT vFreeExpeditionCount THEN
 		CALL util.throw ('NO_FREE_EXPEDITIONS');
 	END IF;
@@ -93,29 +104,19 @@ BEGIN
 			FROM tExpedition
 			WHERE palletFk IS NULL;
 
-	IF vExpeditionWithPallet THEN
-		UPDATE arcRead 
-			SET error = (
-				SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ')
-					FROM tExpedition 
-					WHERE palletFk
-			)
-		WHERE id = vArcId;
-	ELSE
-		UPDATE arcRead SET error = NULL WHERE id = vArcId;
+	UPDATE arcRead SET error = NULL WHERE id = vArcId;
 
-		SELECT printerFk INTO vPrinterFk FROM arcRead WHERE id = vArcId;
+	SELECT printerFk INTO vPrinterFk FROM arcRead WHERE id = vArcId;
 
-		CALL report_print(
-			'LabelPalletExpedition',
-			vPrinterFk,
-			account.myUser_getId(),
-			JSON_OBJECT('palletFk', vPalletFk, 'userFk', account.myUser_getId()),
-			'high'
-		);
+	CALL report_print(
+		'LabelPalletExpedition',
+		vPrinterFk,
+		account.myUser_getId(),
+		JSON_OBJECT('palletFk', vPalletFk, 'userFk', account.myUser_getId()),
+		'high'
+	);
 
-		UPDATE expeditionPallet SET isPrint = TRUE WHERE id = vPalletFk;
-	END IF;
+	UPDATE expeditionPallet SET isPrint = TRUE WHERE id = vPalletFk;
 
 	DROP TEMPORARY TABLE tExpedition;
 END$$