From 2ffdce3c64753453d8b0f53fe0e34eb5efb2808d Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 21 May 2024 14:40:42 +0200
Subject: [PATCH 1/2] refactor: refs #7398 Refactor and change ekt_scan

---
 db/routines/edi/procedures/ekt_scan.sql | 66 +++++++++++++------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/db/routines/edi/procedures/ekt_scan.sql b/db/routines/edi/procedures/ekt_scan.sql
index b0b75a6a7..ccb9adf0a 100644
--- a/db/routines/edi/procedures/ekt_scan.sql
+++ b/db/routines/edi/procedures/ekt_scan.sql
@@ -23,42 +23,39 @@ BEGIN
 	DECLARE vXtraLongAgj INT;
 	DECLARE vDefaultKlo INT;
 
-	SELECT
-		ec.usefulAuctionLeftSegmentLength,
-		ec.standardBarcodeLength,
-		ec.floridayBarcodeLength,
-		ec.floramondoBarcodeLength,
-		ec.defaultKlo
-		INTO
-			vUsefulAuctionLeftSegmentLength,
+	SELECT usefulAuctionLeftSegmentLength,
+			standardBarcodeLength,
+			floridayBarcodeLength,
+			floramondoBarcodeLength,
+			defaultKlo
+		INTO vUsefulAuctionLeftSegmentLength,
 			vStandardBarcodeLength,
 			vFloridayBarcodeLength,
 			vFloramondoBarcodeLength,
 			vDefaultKlo
-		FROM edi.ektConfig ec;
+		FROM ektConfig;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ekt;
-	CREATE TEMPORARY TABLE tmp.ekt
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ekt
 		ENGINE = MEMORY
 		SELECT id ektFk FROM ekt LIMIT 0;
 
-	CASE 
+	CASE
 		WHEN LENGTH(vBarcode) <= vFloridayBarcodeLength THEN
 			INSERT INTO tmp.ekt
 				SELECT id 
-					FROM edi.ektRecent e
+					FROM ektRecent e
 					WHERE e.cps = vBarcode
 						OR e.batchNumber = vBarcode;
 
 		WHEN LENGTH(vBarcode) = vFloramondoBarcodeLength THEN
 			INSERT INTO tmp.ekt
 				SELECT e.id 
-					FROM edi.ektRecent e
+					FROM ektRecent e
 					WHERE e.pro = MID(vBarcode,2,6) 
-						AND CAST(e.ptd AS SIGNED) = MID(vBarcode,8,5);
+						AND CAST(e.ptd AS SIGNED) = MID(vBarcode, 8, 5);
 
 		ELSE
-			SET vBarcode = LPAD(vBarcode,vStandardBarcodeLength,'0');
+			SET vBarcode = LPAD(vBarcode, vStandardBarcodeLength, '0');
 			SET vAuction = MID(vBarcode, 1, 3);
 			SET vKlo = MID(vBarcode, 4, 2);
 			SET vFec = MAKEDATE(YEAR(util.VN_CURDATE()), MID(vBarcode, 6, 3));
@@ -69,21 +66,25 @@ BEGIN
 			-- Clásico de subasta
 			-- Trade standard
 			-- Trade que construye como la subasta
-			-- Trade como el anterior pero sin trade code	
+			-- Trade como el anterior pero sin trade code
 			INSERT INTO tmp.ekt
 				SELECT id
 					FROM ekt
 					WHERE fec >= vFec - INTERVAL 1 DAY
-					AND ((
-						vKlo = vDefaultKlo
+					AND (
+						(vKlo = vDefaultKlo
 							AND (klo = vKlo OR klo IS NULL OR klo = 0)
-							AND agj IN (vShortAgj, vLongAgj, vXtraLongAgj))
-						OR (klo = vKlo
+							AND agj IN (vShortAgj, vLongAgj, vXtraLongAgj)
+						) OR (
+							klo = vKlo
 							AND auction = vAuction
-							AND agj = vShortAgj)
+							AND agj = vShortAgj
+						) OR (
+							klo = auction -- No se si se refiere a esto
+						)
 					)
-			ORDER BY agj DESC, fec DESC
-			LIMIT 1;
+				ORDER BY agj DESC, fec DESC
+				LIMIT 1;
 
 			SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
 
@@ -91,9 +92,11 @@ BEGIN
 			IF NOT vIsFound THEN
 				INSERT INTO tmp.ekt
 					SELECT id 
-						FROM edi.ektRecent e
-						WHERE e.batchNumber 
-							= LEFT(vBarcode,vUsefulAuctionLeftSegmentLength)
+						FROM ektRecent e
+						WHERE e.batchNumber = LEFT(
+								vBarcode,
+								vUsefulAuctionLeftSegmentLength
+							)
 							AND e.batchNumber > 0;
 
 				SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
@@ -103,7 +106,7 @@ BEGIN
 			IF NOT vIsFound THEN
 				INSERT INTO tmp.ekt
 					SELECT id 
-						FROM edi.ektRecent e
+						FROM ektRecent e
 						WHERE e.putOrderFk = vBarcode;
 
 				SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
@@ -113,9 +116,8 @@ BEGIN
 			IF NOT vIsFound THEN
 				INSERT INTO tmp.ekt
 					SELECT id 
-						FROM edi.ektRecent e
-						WHERE e.deliveryNumber
-					= MID(vBarcode, 4, 13)
+						FROM ektRecent e
+						WHERE e.deliveryNumber = MID(vBarcode, 4, 13)
 							AND e.deliveryNumber > 0;
 
 				SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
@@ -124,7 +126,7 @@ BEGIN
 
 	IF vIsFound THEN
 		UPDATE ekt e 
-			JOIN tmp.ekt t ON t.ektFk = e.id
+				JOIN tmp.ekt t ON t.ektFk = e.id
 			SET e.scanned = TRUE;
 	END IF;
 END$$

From 0d620c6f33cb061abbf3f9aa6efd03b80ea11c7d Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 22 May 2024 08:11:27 +0200
Subject: [PATCH 2/2] feat: refs #7398 Change

---
 db/routines/edi/procedures/ekt_scan.sql | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/db/routines/edi/procedures/ekt_scan.sql b/db/routines/edi/procedures/ekt_scan.sql
index ccb9adf0a..0cf8bb466 100644
--- a/db/routines/edi/procedures/ekt_scan.sql
+++ b/db/routines/edi/procedures/ekt_scan.sql
@@ -79,8 +79,6 @@ BEGIN
 							klo = vKlo
 							AND auction = vAuction
 							AND agj = vShortAgj
-						) OR (
-							klo = auction -- No se si se refiere a esto
 						)
 					)
 				ORDER BY agj DESC, fec DESC
@@ -122,6 +120,17 @@ BEGIN
 
 				SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
 			END IF;
+
+			-- Solo campo agj
+			IF NOT vIsFound THEN
+				INSERT INTO tmp.ekt
+					SELECT id 
+						FROM ektRecent
+						WHERE agj = vShortAgj;
+
+				SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
+			END IF;
+
 	END CASE;
 
 	IF vIsFound THEN