db/dump/fixtures.before.sql

@@ -2454,7 +2454,7 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
 INSERT INTO `vn`.`dmsType`
 		(`id`, `name`, 					`readRoleFk`, 	`writeRoleFk`, `code`)
     VALUES
-        (1,  	'Facturas Recibidas',  	NULL,   		NULL,   		'invoiceIn'),
+        (1,  	'Facturas Recibidas',		1,   			1,   		'invoiceIn'),
         (2,  	'Doc oficial',         	NULL,   		NULL,   		'officialDoc'),
         (3,  	'Laboral',             	37,     		37,     		'hhrrData'),
         (4,  	'Albaranes recibidos', 	NULL,   		NULL,   		'deliveryNote'),

db/routines/vn/procedures/collection_getTickets.sql

@@ -30,7 +30,9 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			IFNULL(ob.description,'') observaciones,
-			cc.rgb
+			cc.rgb,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk
@@ -43,6 +45,9 @@ BEGIN
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
+			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE t.id = vParamFk 
 			AND t.shipped >= vYesterday
 	UNION
@@ -52,7 +57,9 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			ob.description,
-			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`
+			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	
@@ -65,6 +72,9 @@ BEGIN
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
+			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE tc.collectionFk = vParamFk
 	UNION
 	SELECT sg.ticketFk,
@@ -73,7 +83,9 @@ BEGIN
 			t.warehouseFk,
 			c.salesPersonFk,
 			ob.description,
-			NULL `rgb`
+			NULL `rgb`,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.sectorCollection sc
 			JOIN vn.sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id 
 			JOIN vn.saleGroup sg ON sg.id = ss.saleGroupFk
@@ -82,6 +94,9 @@ BEGIN
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk 
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 			LEFT JOIN vn.client c ON c.id = t.clientFk
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
+			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE sc.id = vParamFk
 			AND t.shipped >= vYesterday
 			GROUP BY ticketFk;

db/routines/vn/procedures/expedition_selfConsumptionPackaging.sql

@@ -0,0 +1,93 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expedition_selfConsumptionPackaging`(
+	vSelf INT,
+	vAction ENUM('add', 'remove')
+)
+BEGIN
+/**
+ * Maneja el consumo de cajas para autoconsumo, permitiendo
+ * añadir o quitar cajas utilizadas según la acción indicada.
+ *
+ * @param vSelf Id de expedición
+ */
+	DECLARE vClientFk INT;
+	DECLARE vAddressFk INT;
+	DECLARE vItemFk INT;
+	DECLARE vItemName VARCHAR(50);
+	DECLARE vWarehouseFk INT;
+	DECLARE vCreated DATE;
+	DECLARE vTicketFk INT;
+	DECLARE vSaleFk INT;
+	DECLARE vQuantity INT;
+
+	IF vAction NOT IN ('add', 'remove') THEN
+		CALL util.throw('Action not supported');
+	END IF;
+
+	SELECT pc.clientSelfConsumptionFk,
+			pc.addressSelfConsumptionFk,
+			i.id,
+			i.name,
+			t.warehouseFk,
+			e.created
+			INTO vClientFk,
+				vAddressFk,
+				vItemFk,
+				vItemName,
+				vWarehouseFk,
+				vCreated
+		FROM expedition e
+			JOIN packaging p ON p.id = e.packagingFk
+			JOIN item i ON i.id = p.itemFk
+			JOIN ticket t ON t.id = e.ticketFk
+			JOIN productionConfig pc
+		WHERE e.id = vSelf;
+
+	IF vClientFk IS NULL OR vAddressFk IS NULL THEN
+		CALL util.throw('Some config parameters are not set');
+	END IF;
+
+	SET vCreated = DATE(vCreated);
+
+	SELECT id INTO vTicketFk
+		FROM ticket
+			WHERE shipped BETWEEN vCreated AND util.dayEnd(vCreated)
+				AND clientFk = vClientFk
+				AND addressFk = vAddressFk
+				AND warehouseFk = vWarehouseFk;
+
+	IF vTicketFk IS NULL AND vAction = 'add' THEN
+		INSERT INTO ticket(clientFk, warehouseFk, shipped, nickname, addressFk)
+			VALUES (vClientFk, vWarehouseFk, vCreated, 'CAJAS AUTOCONSUMO', vAddressFk);
+
+		SET vTicketFk = LAST_INSERT_ID();
+	END IF;
+
+	SELECT id, quantity INTO vSaleFk, vQuantity
+		FROM sale
+		WHERE itemFk = vItemFk
+			AND ticketFk = vTicketFk
+		LIMIT 1;
+
+	IF vAction = 'add' THEN
+		IF vSaleFk IS NOT NULL THEN
+			UPDATE sale
+				SET quantity = quantity + 1
+				WHERE id = vSaleFk;
+		ELSE
+			INSERT INTO sale(itemFk, ticketFk, concept, quantity)
+				VALUES (vItemFk, vTicketFk, vItemName, 1);
+		END IF;
+	ELSE
+		IF vSaleFk IS NOT NULL THEN
+			IF vQuantity > 1 THEN
+				UPDATE sale
+					SET quantity = quantity - 1
+					WHERE id = vSaleFk;
+			ELSE
+				DELETE FROM sale WHERE id = vSaleFk;
+			END IF;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/itemShelving_get.sql

@@ -7,9 +7,10 @@ BEGIN
 * @param vSelf matrícula del carro
 **/
 	SELECT ish.itemFk item, 
-			IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description, 
+			i.name, 
+			i.longName,
+			i.size, 
 			ish.visible,
-			CEIL(ish.visible/ish.packing) stickers,
 			ish.packing,
 			ish.grouping,
 			p.code,
@@ -17,7 +18,8 @@ BEGIN
 			s.priority,
 			ish.isChecked,
 			ic.url,
-			ish.available
+			ish.available,
+			ish.buyFk
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
 			JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci

db/routines/vn/triggers/expedition_afterDelete.sql

@@ -8,5 +8,7 @@ BEGIN
 			`changedModel` = 'Expedition',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
+	
+	CALL expedition_selfConsumptionPackaging(OLD.id, 'remove');
 END$$
 DELIMITER ;

db/versions/11274-redGerbera/00-firstScript4.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.autonomy MODIFY COLUMN isUeeMember tinyint(1) DEFAULT FALSE NOT NULL;