refactor: refs #8058

db/routines/vn/procedures/ticket_mergeSales.sql

@@ -3,12 +3,19 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
 	vSelf INT
 )
 BEGIN
+	DECLARE vHasSalesToMerge BOOL;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
 
+	START TRANSACTION;
+
+	SELECT id INTO vSelf
+		FROM ticket
+		WHERE id = vSelf FOR UPDATE;
+
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
 		(PRIMARY KEY (id))
 		ENGINE = MEMORY
@@ -18,26 +25,25 @@ BEGIN
 				JOIN itemType it ON it.id = i.typeFk
 			WHERE s.ticketFk = vSelf
 				AND it.isMergeable
-			GROUP BY s.itemFk, s.price, s.discount;
+			GROUP BY s.itemFk, s.price, s.discount
+			HAVING COUNT(*) > 1;
 
-	START TRANSACTION;
+	SELECT COUNT(*) INTO vHasSalesToMerge
+	 	FROM tSalesToPreserve;
 
+	IF vHasSalesToMerge THEN 
 		UPDATE sale s 
 				JOIN tSalesToPreserve stp ON stp.id = s.id
-		SET s.quantity = newQuantity
+			SET s.quantity = newQuantity;
-		WHERE s.ticketFk = vSelf;
 
-	DELETE s.*
+		DELETE s
 			FROM sale s
-			LEFT JOIN tSalesToPreserve stp ON stp.id = s.id
+				JOIN tSalesToPreserve stp ON stp.itemFk = s.itemFk
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType it ON it.id = i.typeFk
 			WHERE s.ticketFk = vSelf
-			AND stp.id IS NULL
+				AND s.id <> stp.id;
-			AND it.isMergeable;
+	END IF;
 
 	COMMIT;
-
 	DROP TEMPORARY TABLE tSalesToPreserve;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -12,74 +12,53 @@ BEGIN
  * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
  * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
-	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
-	DECLARE vNewTicketFk INT;
-	DECLARE vPackingTypesToSplit INT;
 	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vHasItemPackingType BOOL;
+	DECLARE vItemPackingTypeFk INT;
+	DECLARE vNewTicketFk INT;
 
-	DECLARE vSaleGroup CURSOR FOR
+	DECLARE vItemPackingTypes CURSOR FOR 
-		SELECT itemPackingTypeFk
+		SELECT DISTINCT itemPackingTypeFk 
-			FROM tSaleGroup
+			FROM tSalesToMove;
-			WHERE itemPackingTypeFk IS NOT NULL
-			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	START TRANSACTION;
+	SELECT COUNT(*) INTO vHasItemPackingType
-
+			FROM ticket t	
-	SELECT id
+				JOIN sale s ON s.ticketFk = t.id
-		FROM sale
-		WHERE ticketFk = vSelf
-			AND NOT quantity
-		FOR UPDATE;
-
-	DELETE FROM sale
-		WHERE NOT quantity
-		AND ticketFk = vSelf;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSale
-		(PRIMARY KEY (id))
-		ENGINE = MEMORY
-		SELECT s.id, i.itemPackingTypeFk, IFNULL(sv.litros, 0) litros
-			FROM sale s
 				JOIN item i ON i.id = s.itemFk
-				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
+			WHERE t.id = vSelf
-			WHERE s.ticketFk = vSelf;
+				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
-		ENGINE = MEMORY
-		SELECT itemPackingTypeFk, SUM(litros) totalLitros
-			FROM tSale
-			GROUP BY itemPackingTypeFk;
-
-	SELECT COUNT(*) INTO vPackingTypesToSplit
-		FROM tSaleGroup
-		WHERE itemPackingTypeFk IS NOT NULL;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
 		itemPackingTypeFk VARCHAR(1)
+	) ENGINE=MEMORY
+		SELECT vSelf, vOriginalItemPackingTypeFk;
+
+	IF NOT vHasItemPackingType THEN
+		LEAVE proc;
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
+		ticketFk INT,
+		saleFk INT,
+		itemPackingTypeFk INT
 	) ENGINE=MEMORY;
 
-	CASE vPackingTypesToSplit
+	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
-		WHEN 0 THEN
+		SELECT s.id, i.itemPackingTypeFk 
-			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+			FROM ticket t	
-				VALUES(vSelf, vItemPackingTypeFk);
+				JOIN sale s ON s.ticketFk = t.id
-		WHEN 1 THEN
+				JOIN item i ON i.id = s.itemFk 
-			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+			WHERE t.id = vSelf
-				SELECT vSelf, itemPackingTypeFk
+				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
-					FROM tSaleGroup
-					WHERE itemPackingTypeFk IS NOT NULL;
-		ELSE
-			OPEN vSaleGroup;
-			FETCH vSaleGroup INTO vItemPackingTypeFk;
 
-			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+	OPEN vItemPackingTypes;
-				VALUES(vSelf, vItemPackingTypeFk);
 
 	l: LOOP
 		SET vDone = FALSE;
-				FETCH vSaleGroup INTO vItemPackingTypeFk;
+		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
 
 		IF vDone THEN
 			LEAVE l;
@@ -87,40 +66,24 @@ BEGIN
 
 		CALL ticket_Clone(vSelf, vNewTicketFk);
 
-				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+		UPDATE tSalesToMove
-					VALUES(vNewTicketFk, vItemPackingTypeFk);
+			SET ticketFk = vNewTicketFk
+			WHERE itemPackingTypeFk = vItemPackingTypeFk;
+
 	END LOOP;
 
-			CLOSE vSaleGroup;
+	CLOSE vItemPackingTypes;
-
-			SELECT s.id
-				FROM sale s
-					JOIN tSale ts ON ts.id = s.id
-					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
-				FOR UPDATE;
 
 	UPDATE sale s
-					JOIN tSale ts ON ts.id = s.id
+			JOIN tSalesToMove stm ON stm.saleFk = s.id
-					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
+		SET s.ticketFk = stm.ticketFk
-				SET s.ticketFk = t.ticketFk;
+		WHERE stm.ticketFk;
 
-			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
+	INSERT INTO tmp.ticketIPT
-				FROM tSaleGroup sg
+		SELECT ticketFk, itemPackingTypeFk
-				WHERE sg.itemPackingTypeFk IS NOT NULL
+			FROM tSalesToMove
-				ORDER BY sg.itemPackingTypeFk
+			GROUP BY ticketFk;
-				LIMIT 1;
 
-			UPDATE sale s
+	DROP TEMPORARY TABLE tSalesToMove;
-					JOIN tSale ts ON ts.id = s.id
-					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = vItemPackingTypeFk
-				SET s.ticketFk = t.ticketFk
-				WHERE ts.itemPackingTypeFk IS NULL;
-	END CASE;
-
-	COMMIT;
-
-	DROP TEMPORARY TABLE
-		tSale,
-		tSaleGroup;
 END$$
 DELIMITER ;