Merge pull request 'test' (!2217) from test into dev

Reviewed-on: #2217

db/routines/vn/procedures/collection_new.sql

@@ -28,6 +28,7 @@ proc:BEGIN
 	DECLARE vLockName VARCHAR(215);
 	DECLARE vLockTime INT DEFAULT 15;
 	DECLARE vFreeWagonFk INT;
+
 	DECLARE c1 CURSOR FOR
 		SELECT ticketFk, `lines`, m3
 			FROM tmp.productionBuffer
@@ -44,13 +45,21 @@ proc:BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		IF vLockName IS NOT NULL THEN
+			DO RELEASE_LOCK(vLockName);
+		END IF;
+
+		RESIGNAL;
+	END;
+
 	SELECT pc.ticketTrolleyMax * o.numberOfWagons,
 			pc.hasUniqueCollectionTime,
 			w.code,
 			o.warehouseFk,
 			o.itemPackingTypeFk,
 			st.code,
-			CONCAT('collection_new', o.warehouseFk, ':',o.itemPackingTypeFk),
 			o.numberOfWagons,
 			o.trainFk,
 			o.linesLimit,
@@ -61,7 +70,6 @@ proc:BEGIN
 				vWarehouseFk,
 				vItemPackingTypeFk,
 				vStateFk,
-				vLockName,
 				vWagons,
 				vTrainFk,
 				vLinesLimit,
@@ -71,6 +79,12 @@ proc:BEGIN
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
 			JOIN operator o ON o.workerFk = vUserFk;
 
+	SET vLockName = CONCAT_WS('/',
+		'collection_new',
+		vWarehouseFk,
+		vItemPackingTypeFk
+	);
+
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
 		LEAVE proc;
 	END IF;
@@ -250,13 +264,13 @@ proc:BEGIN
 					UPDATE tTrain
 						SET ticketFk = vFirstTicketFk
 						WHERE wagon = vFreeWagonFk;
-	
+
 					-- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo
 					DELETE tt.*
 						FROM tTrain tt
 							LEFT JOIN (
-								SELECT DISTINCT wagon 
+								SELECT DISTINCT wagon
-									FROM tTrain 
+									FROM tTrain
 									WHERE ticketFk IS NOT NULL
 							) nn ON nn.wagon = tt.wagon
 						WHERE nn.wagon IS NULL;
@@ -271,7 +285,7 @@ proc:BEGIN
 			FETCH c1 INTO vTicketFk, vTicketLines, vTicketVolume;
 			IF vDone THEN
 				LEAVE read_loop;
-			END IF;		
+			END IF;
 		END IF;
 	END LOOP;
 	CLOSE c1;