From ddd5e4ffa491ce3b98a025659475e4d16b7b8d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Fri, 2 Aug 2024 10:28:50 +0200
Subject: [PATCH 1/2] fix: refs #7829 Error al calcular problemas de
 componentes

---
 .../vn/procedures/sale_getProblems.sql        | 29 +++++++--------
 .../ticket_setProblemRiskByClient.sql         | 35 +++++++++++++++++++
 2 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 db/routines/vn/procedures/ticket_setProblemRiskByClient.sql

diff --git a/db/routines/vn/procedures/sale_getProblems.sql b/db/routines/vn/procedures/sale_getProblems.sql
index ba4ff5857..730d84f38 100644
--- a/db/routines/vn/procedures/sale_getProblems.sql
+++ b/db/routines/vn/procedures/sale_getProblems.sql
@@ -13,7 +13,7 @@ BEGIN
 	DECLARE vAvailableCache INT;
 	DECLARE vVisibleCache INT;
 	DECLARE vDone BOOL;
-	DECLARE vComponentCount INT;
+	DECLARE vRequiredComponent INT;
 
 	DECLARE vCursor CURSOR FOR
 		SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(tt.shipped))
@@ -54,7 +54,7 @@ BEGIN
 			SELECT ticketFk, clientFk
 				FROM tmp.sale_getProblems;
 
-	SELECT COUNT(*) INTO vComponentCount
+	SELECT COUNT(*) INTO vRequiredComponent
 		FROM component
 		WHERE isRequired;
 
@@ -96,20 +96,17 @@ BEGIN
 
 	-- Faltan componentes
 	INSERT INTO tmp.sale_problems(ticketFk, hasComponentLack, saleFk)
-		SELECT ticketFk, (vComponentCount > nComp) hasComponentLack, saleFk
-			FROM (
-				SELECT COUNT(s.id) nComp, tl.ticketFk, s.id saleFk
-					FROM tmp.ticket_list tl
-						JOIN sale s ON s.ticketFk = tl.ticketFk
-						LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-						LEFT JOIN component c ON c.id = sc.componentFk AND c.isRequired
-						JOIN ticket t ON t.id = tl.ticketFk
-						JOIN agencyMode am ON am.id = t.agencyModeFk
-						JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-						WHERE dm.code IN ('AGENCY','DELIVERY','PICKUP')
-							AND s.quantity > 0
-					GROUP BY s.id
-			) sub
+		SELECT t.id, COUNT(c.id) < vRequiredComponent hasComponentLack, s.id
+			FROM tmp.ticket_list tl
+				JOIN ticket t ON t.id = tl.ticketFk
+				JOIN sale s ON s.ticketFk = t.id
+				JOIN agencyMode am ON am.id = t.agencyModeFk
+				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+				LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+				LEFT JOIN component c ON c.id = sc.componentFk AND c.isRequired
+			WHERE dm.code IN ('AGENCY','DELIVERY','PICKUP')
+				AND s.quantity > 0
+			GROUP BY s.id
 			HAVING hasComponentLack;
 
 	-- Cliente congelado
diff --git a/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
new file mode 100644
index 000000000..d652f5269
--- /dev/null
+++ b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
@@ -0,0 +1,35 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
+	vClientFk INT
+)
+BEGIN
+/**
+ * Updates future ticket risk for a client
+ *
+ * @param vClientFk Id client
+ */
+	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vTicketFk INT;
+	DECLARE vTickets CURSOR FOR
+		SELECT id
+			FROM ticket
+			WHERE clientFk = vClientFk
+				AND shipped >= util.VN_CURDATE();
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	
+	OPEN vTickets;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vTickets INTO vTicketFk;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		CALL vn.ticket_setProblemRisk(vTicketFk);
+	END LOOP;
+
+	CLOSE vTickets;
+END$$
+DELIMITER ;
\ No newline at end of file

From 29a50caaca99ec6024f13fa9780c67130ad72e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Fri, 2 Aug 2024 11:43:30 +0200
Subject: [PATCH 2/2] fix: refs #7829 Error al calcular problemas de
 componentes

---
 db/routines/vn/procedures/sale_getProblems.sql              | 3 ++-
 db/routines/vn/procedures/ticket_setProblemRiskByClient.sql | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/db/routines/vn/procedures/sale_getProblems.sql b/db/routines/vn/procedures/sale_getProblems.sql
index 730d84f38..979978f4a 100644
--- a/db/routines/vn/procedures/sale_getProblems.sql
+++ b/db/routines/vn/procedures/sale_getProblems.sql
@@ -103,7 +103,8 @@ BEGIN
 				JOIN agencyMode am ON am.id = t.agencyModeFk
 				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 				LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-				LEFT JOIN component c ON c.id = sc.componentFk AND c.isRequired
+				LEFT JOIN component c ON c.id = sc.componentFk 
+					AND c.isRequired
 			WHERE dm.code IN ('AGENCY','DELIVERY','PICKUP')
 				AND s.quantity > 0
 			GROUP BY s.id
diff --git a/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
index d652f5269..8479550de 100644
--- a/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
+++ b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
@@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRi
 )
 BEGIN
 /**
- * Updates future ticket risk for a client
+ * Updates future ticket risk for a client.
  *
  * @param vClientFk Id client
  */
@@ -14,7 +14,8 @@ BEGIN
 		SELECT id
 			FROM ticket
 			WHERE clientFk = vClientFk
-				AND shipped >= util.VN_CURDATE();
+				AND shipped >= util.VN_CURDATE()
+				AND refFk IS NULL;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	
@@ -29,7 +30,6 @@ BEGIN
 
 		CALL vn.ticket_setProblemRisk(vTicketFk);
 	END LOOP;
-
 	CLOSE vTickets;
 END$$
 DELIMITER ;
\ No newline at end of file