From 6cbf25dee597f2c9b765bedb086a286cae55564f Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Mon, 16 Sep 2024 08:10:58 +0200
Subject: [PATCH 1/2] fix: refs #7969 fix on collectionNew

---
 db/routines/vn/procedures/collection_new.sql  |  3 ++-
 .../vn/procedures/productionControl.sql       | 23 +++++++++++++++----
 .../11229-salmonAsparagus/00-firstScript.sql  |  2 ++
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 db/versions/11229-salmonAsparagus/00-firstScript.sql

diff --git a/db/routines/vn/procedures/collection_new.sql b/db/routines/vn/procedures/collection_new.sql
index 6e112634e..940540afb 100644
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@@ -196,7 +196,8 @@ BEGIN
 				OR LENGTH(pb.problem) > 0
 				OR pb.lines > vLinesLimit
 				OR pb.m3 > vVolumeLimit
-				OR sub.maxSize > vSizeLimit;
+				OR sub.maxSize > vSizeLimit
+				OR pb.hasPlantTray;
 	END IF;
 
 	-- Es importante que el primer ticket se coja en todos los casos
diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql
index 84717a19a..842a306b4 100644
--- a/db/routines/vn/procedures/productionControl.sql
+++ b/db/routines/vn/procedures/productionControl.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`productionControl`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`productionControl`(
 	vWarehouseFk INT,
 	vScopeDays INT
 )
@@ -211,8 +211,6 @@ proc: BEGIN
 		salesInParkingCount INT DEFAULT 0)
 		ENGINE = MEMORY;
 
-	-- Insertamos todos los tickets que tienen productos parkineados
-	-- en sectores de previa, segun el sector
 	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock
 		(PRIMARY KEY(itemFk, sectorFk))
 		ENGINE = MEMORY
@@ -245,7 +243,6 @@ proc: BEGIN
 				AND s.quantity > 0
 			GROUP BY pb.ticketFk;
 
-	-- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
 	UPDATE tmp.ticketWithPrevia twp
 		JOIN (
 			SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
@@ -259,12 +256,28 @@ proc: BEGIN
 		) sub ON twp.ticketFk = sub.ticketFk
 		SET twp.salesInParkingCount = sub.salesInParkingCount;
 
-	-- Marcamos como pendientes aquellos que no coinciden las cantidades
 	UPDATE tmp.productionBuffer pb
 			JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
 		SET pb.previousWithoutParking = TRUE
 		WHERE twp.salesCount > twp.salesInParkingCount;
 
+	-- hasPlantTray
+	ALTER TABLE tmp.productionBuffer
+		ADD hasPlantTray BOOL DEFAULT FALSE;
+
+	UPDATE tmp.productionBuffer pb
+			JOIN sale s ON s.ticketFk = pb.ticketFk
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemType it ON it.id = i.typeFk
+			JOIN itemCategory ic ON ic.id = it.categoryFk
+			JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk AND lb.item_id = s.itemFk
+			JOIN buy b ON b.id = lb.buy_id
+			JOIN packaging p ON p.id = b.packagingFk
+			JOIN productionConfig pc
+		SET hasPlantTray = TRUE
+		WHERE ic.code = 'plant'
+			AND p.`depth` >= pc.minPlantTrayLength;		
+
 	DROP TEMPORARY TABLE
 		tmp.productionTicket,
 		tmp.ticket,
diff --git a/db/versions/11229-salmonAsparagus/00-firstScript.sql b/db/versions/11229-salmonAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..e51fe0933
--- /dev/null
+++ b/db/versions/11229-salmonAsparagus/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.productionConfig ADD IF NOT EXISTS minPlantTrayLength INT DEFAULT 53 NOT NULL 
+COMMENT 'minimum length for plant tray restriction. Avoid to make collection of the ticket with this kind of item';
\ No newline at end of file
-- 
2.40.1


From 390b8271c2964df4654222f38dd1e62f97c99415 Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Mon, 16 Sep 2024 08:20:17 +0200
Subject: [PATCH 2/2] fix: root instead of vn

---
 db/routines/vn/procedures/productionControl.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql
index 842a306b4..76d24c7dd 100644
--- a/db/routines/vn/procedures/productionControl.sql
+++ b/db/routines/vn/procedures/productionControl.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`productionControl`(
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`productionControl`(
 	vWarehouseFk INT,
 	vScopeDays INT
 )
-- 
2.40.1