From 9e87b055b74ff8f35eb4c81c0b54695449f0bbdb Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Sat, 27 Apr 2024 12:36:21 +0200
Subject: [PATCH 1/2] hotFix

---
 db/routines/vn/procedures/collection_assign.sql | 8 +++++---
 db/routines/vn/procedures/collection_new.sql    | 8 +++++---
 db/versions/11016-pinkAralia/00-firstScript.sql | 5 +++++
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 db/versions/11016-pinkAralia/00-firstScript.sql

diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql
index f6000e87d2..1d656a0ed1 100644
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@@ -30,8 +30,10 @@ BEGIN
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
-		INTO vHasTooMuchCollections
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0,
+			pc.collection_assign_lockname
+		INTO vHasTooMuchCollections,
+			 vLockName
 		FROM tCollection
 			JOIN productionConfig pc;
 
@@ -47,7 +49,7 @@ BEGIN
 		WHERE workerFk = vUserFk;
 
 	SET vLockName = CONCAT_WS('/',
-		'collection_assign',
+		vLockName,
 		vWarehouseFk,
 		vItemPackingTypeFk
 	);
diff --git a/db/routines/vn/procedures/collection_new.sql b/db/routines/vn/procedures/collection_new.sql
index f3767ddf33..8a1eff4a11 100644
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@@ -63,7 +63,8 @@ BEGIN
 			o.numberOfWagons,
 			o.trainFk,
 			o.linesLimit,
-			o.volumeLimit
+			o.volumeLimit,
+			pc.collection_new_lockname
 		INTO vMaxTickets,
 				vHasUniqueCollectionTime,
 				vWorkerCode,
@@ -73,14 +74,15 @@ BEGIN
 				vWagons,
 				vTrainFk,
 				vLinesLimit,
-				vVolumeLimit
+				vVolumeLimit,
+				vLockName
 		FROM productionConfig pc
 			JOIN worker w ON w.id = vUserFk
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
 			JOIN operator o ON o.workerFk = vUserFk;
 
 	SET vLockName = CONCAT_WS('/',
-		'collection_new',
+		vLockName,
 		vWarehouseFk,
 		vItemPackingTypeFk
 	);
diff --git a/db/versions/11016-pinkAralia/00-firstScript.sql b/db/versions/11016-pinkAralia/00-firstScript.sql
new file mode 100644
index 0000000000..6755072541
--- /dev/null
+++ b/db/versions/11016-pinkAralia/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE vn.productionConfig ADD collection_new_lockname varchar(100) 
+    DEFAULT 'collection_new' NOT NULL COMMENT 'Lockname value for proc vn.collection_new';
+ALTER TABLE vn.productionConfig ADD collection_assign_lockname varchar(100) 
+    DEFAULT 'collection_assign' NULL COMMENT 'Lockname value for proc vn.collection_new';

From 9aa6e3f80a0455711bbef787b5bbcfd4eba37cea Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Sat, 27 Apr 2024 13:09:15 +0200
Subject: [PATCH 2/2] hotfix

---
 db/routines/vn/procedures/collection_assign.sql | 2 +-
 db/routines/vn/procedures/collection_new.sql    | 2 +-
 db/versions/11016-pinkAralia/00-firstScript.sql | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql
index 1d656a0ed1..47efa7cd32 100644
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@@ -31,7 +31,7 @@ BEGIN
 	CALL collection_get(vUserFk);
 
 	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0,
-			pc.collection_assign_lockname
+			pc.collectionAssignLockname
 		INTO vHasTooMuchCollections,
 			 vLockName
 		FROM tCollection
diff --git a/db/routines/vn/procedures/collection_new.sql b/db/routines/vn/procedures/collection_new.sql
index 8a1eff4a11..f207eb2b01 100644
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@@ -64,7 +64,7 @@ BEGIN
 			o.trainFk,
 			o.linesLimit,
 			o.volumeLimit,
-			pc.collection_new_lockname
+			pc.collectionNewLockname
 		INTO vMaxTickets,
 				vHasUniqueCollectionTime,
 				vWorkerCode,
diff --git a/db/versions/11016-pinkAralia/00-firstScript.sql b/db/versions/11016-pinkAralia/00-firstScript.sql
index 6755072541..de090013d9 100644
--- a/db/versions/11016-pinkAralia/00-firstScript.sql
+++ b/db/versions/11016-pinkAralia/00-firstScript.sql
@@ -1,5 +1,5 @@
 -- Place your SQL code here
-ALTER TABLE vn.productionConfig ADD collection_new_lockname varchar(100) 
+ALTER TABLE vn.productionConfig ADD collectionNewLockname varchar(100) 
     DEFAULT 'collection_new' NOT NULL COMMENT 'Lockname value for proc vn.collection_new';
-ALTER TABLE vn.productionConfig ADD collection_assign_lockname varchar(100) 
+ALTER TABLE vn.productionConfig ADD collectionAssignLockname varchar(100) 
     DEFAULT 'collection_assign' NULL COMMENT 'Lockname value for proc vn.collection_new';