Merge branch 'dev' into 7685-delivery_beforeDeadlock

db/dump/fixtures.before.sql

@@ -528,7 +528,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (5, 'Administrative',   'administrative'),
         (6, 'Weight',           'weight'),
         (7, 'InvoiceOut',       'invoiceOut'),
-        (8, 'DropOff',           'dropOff');
+        (8, 'DropOff',          'dropOff'),
+		(9, 'Sustitución',		'substitution');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -1,59 +1,67 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_splitItemPackingType`(
-	vTicketFk INT,
-	vOriginalItemPackingTypeFk VARCHAR(1)
+	vSelf INT,
+	vItemPackingTypeFk VARCHAR(1)
 )
 BEGIN
 /**
  * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
  * Respeta el id inicial para el tipo propuesto.
  *
- * @param vTicketFk Identificador de vn.ticket
- * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
+ * @param vSelf Id ticket
+ * @param vItemPackingTypeFk 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 cur1 CURSOR FOR
+	DECLARE vSaleGroup CURSOR FOR
 		SELECT itemPackingTypeFk
-			FROM tmp.saleGroup
+			FROM tSaleGroup
 			WHERE itemPackingTypeFk IS NOT NULL
-			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;
+			ORDER BY (itemPackingTypeFk = vItemPackingTypeFk) DESC;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
+		ROLLBACK;
 		RESIGNAL;
 	END;
 
-	DELETE FROM vn.sale
-		WHERE quantity = 0
-		AND ticketFk = vTicketFk;
+	START TRANSACTION;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+	SELECT 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 vn.sale s
-				JOIN vn.item i ON i.id = s.itemFk
-				LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
-			WHERE s.ticketFk = vTicketFk;
+		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 s.ticketFk = vSelf;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.saleGroup
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
 		ENGINE = MEMORY
 		SELECT itemPackingTypeFk, SUM(litros) totalLitros
-			FROM tmp.sale
+			FROM tSale
 			GROUP BY itemPackingTypeFk;
 
 	SELECT COUNT(*) INTO vPackingTypesToSplit
-		FROM tmp.saleGroup
+		FROM tSaleGroup
 		WHERE itemPackingTypeFk IS NOT NULL;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT (
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
 		itemPackingTypeFk VARCHAR(1)
 	) ENGINE = MEMORY;
@@ -61,55 +69,63 @@ BEGIN
 	CASE vPackingTypesToSplit
 		WHEN 0 THEN
 			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				VALUES(vTicketFk, vItemPackingTypeFk);
+				VALUES(vSelf, vItemPackingTypeFk);
 		WHEN 1 THEN
 			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				SELECT vTicketFk, itemPackingTypeFk
-					FROM tmp.saleGroup
+				SELECT vSelf, itemPackingTypeFk
+					FROM tSaleGroup
 					WHERE itemPackingTypeFk IS NOT NULL;
 		ELSE
-			OPEN cur1;
-
-			FETCH cur1 INTO vItemPackingTypeFk;
+			OPEN vSaleGroup;
+			FETCH vSaleGroup INTO vItemPackingTypeFk;
 
 			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				VALUES(vTicketFk, vItemPackingTypeFk);
+				VALUES(vSelf, vItemPackingTypeFk);
 
-			read_loop: LOOP
-				FETCH cur1 INTO vItemPackingTypeFk;
+			l: LOOP
+				SET vDone = FALSE;
+				FETCH vSaleGroup INTO vItemPackingTypeFk;
 
 				IF vDone THEN
-					LEAVE read_loop;
+					LEAVE l;
 				END IF;
 
-				CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
+				CALL ticket_Clone(vSelf, vNewTicketFk);
 
 				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
 					VALUES(vNewTicketFk, vItemPackingTypeFk);
 			END LOOP;
 
-			CLOSE cur1;
+			CLOSE vSaleGroup;
 
-			UPDATE vn.sale s
-					JOIN tmp.sale ts ON ts.id = s.id
+			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 tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
 				SET s.ticketFk = t.ticketFk;
 
 			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
-				FROM tmp.saleGroup sg
+				FROM tSaleGroup sg
 				WHERE sg.itemPackingTypeFk IS NOT NULL
 				ORDER BY sg.itemPackingTypeFk
 				LIMIT 1;
 
-			UPDATE vn.sale s
-					JOIN tmp.sale ts ON ts.id = s.id
+			UPDATE sale s
+					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
-		tmp.sale,
-		tmp.saleGroup;
+		tSale,
+		tSaleGroup;
 END$$
 DELIMITER ;

db/versions/11132-aquaDracena/00-firstScript.vn.sql

@@ -0,0 +1,2 @@
+INSERT IGNORE INTO vn.observationType (`description`,code)
+    VALUES ('Sustitución','substitution');

print/templates/reports/buy-label/buy-label.js

@@ -7,7 +7,7 @@ module.exports = {
     name: 'buy-label',
     mixins: [vnReport],
     async serverPrefetch() {
-        this.buys = await this.rawSqlFromDef('buys', [this.id]);
+        this.buys = await this.rawSqlFromDef('buys', [this.id, this.id]);
         this.maxLabelNum = Math.max(...this.buys.map(buy => buy.labelNum));
         const date = new Date();
         this.weekNum = moment(date).isoWeek();

print/templates/reports/buy-label/sql/buys.sql

@@ -1,4 +1,15 @@
-SELECT ROW_NUMBER() OVER(ORDER BY b.id) labelNum,
+WITH RECURSIVE numbers AS (
+	SELECT 1 n
+	UNION ALL
+	SELECT n + 1
+		FROM numbers
+		WHERE n < (
+		SELECT MAX(stickers)
+			FROM buy
+			WHERE entryFk = ?
+	)
+)
+SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
 		i.name,
 		i.`size`,
 		i.category,
@@ -15,4 +26,6 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id) labelNum,
 		LEFT JOIN producer p ON p.id = i.producerFk
 		LEFT JOIN ink ON ink.id = i.inkFk
 		LEFT JOIN origin o ON o.id = i.originFk
-	WHERE b.entryFk = ?
+		JOIN numbers num
+		WHERE b.entryFk = ?
+			AND num.n <= b.stickers