Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

db/routines/hedera/procedures/order_confirmWithUser.sql

@@ -1,59 +1,62 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_confirmWithUser`(vSelf INT, vUserId INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_confirmWithUser`(
+	vSelf INT,
+	vUserFk INT
+)
 BEGIN
 /**
- * Confirms an order, creating each of its tickets on the corresponding
- * date, store and user.
+ * Confirms an order, creating each of its tickets
+ * on the corresponding date, store and user.
  *
  * @param vSelf The order identifier
  * @param vUser The user identifier
  */
-	DECLARE vOk BOOL;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWarehouse INT;
+	DECLARE vHasRows BOOL;
+	DECLARE vDone BOOL;
+	DECLARE vWarehouseFk INT;
 	DECLARE vShipment DATE;
-	DECLARE vTicket INT;
+	DECLARE vShipmentDayEnd DATETIME;
+	DECLARE vTicketFk INT;
 	DECLARE vNotes VARCHAR(255);
-	DECLARE vItem INT;
+	DECLARE vItemFk INT;
 	DECLARE vConcept VARCHAR(30);
 	DECLARE vAmount INT;
+	DECLARE vAvailable INT;
 	DECLARE vPrice DECIMAL(10,2);
-	DECLARE vSale INT;
-	DECLARE vRate INT;
-	DECLARE vRowId INT;
+	DECLARE vSaleFk INT;
+	DECLARE vRowFk INT;
 	DECLARE vPriceFixed DECIMAL(10,2);
-	DECLARE vDelivery DATE;
-	DECLARE vAddress INT;
-	DECLARE vIsConfirmed BOOL;
-	DECLARE vClientId INT;
-	DECLARE vCompanyId INT;
-	DECLARE vAgencyModeId INT;
-	DECLARE TICKET_FREE INT DEFAULT 2;
-	DECLARE vCalc INT;
-	DECLARE vIsLogifloraItem BOOL;
-	DECLARE vOldQuantity INT;
-	DECLARE vNewQuantity INT;
+	DECLARE vLanded DATE;
+	DECLARE vAddressFk INT;
+	DECLARE vClientFk INT;
+	DECLARE vCompanyFk INT;
+	DECLARE vAgencyModeFk INT;
+	DECLARE vCalcFk INT;
 	DECLARE vIsTaxDataChecked BOOL;
 
-	DECLARE cDates CURSOR FOR
-		SELECT zgs.shipped, r.warehouse_id
+	DECLARE vDates CURSOR FOR
+		SELECT zgs.shipped, r.warehouseFk
 			FROM `order` o
-				JOIN order_row r ON r.order_id = o.id
-				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouse_id
-			WHERE o.id = vSelf AND r.amount != 0
-			GROUP BY r.warehouse_id;
+				JOIN orderRow r ON r.orderFk = o.id
+				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouseFk
+			WHERE o.id = vSelf
+				AND r.amount
+			GROUP BY r.warehouseFk;
 
-	DECLARE cRows CURSOR FOR
-		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate, i.isFloramondo
-			FROM order_row r
-				JOIN vn.item i ON i.id = r.item_id
-			WHERE r.amount != 0
-				AND r.warehouse_id = vWarehouse
-				AND r.order_id = vSelf
+	DECLARE vRows CURSOR FOR
+		SELECT r.id,
+				r.itemFk,
+				i.name,
+				r.amount,
+				r.price
+			FROM orderRow r
+				JOIN vn.item i ON i.id = r.itemFk
+			WHERE r.amount
+				AND r.warehouseFk = vWarehouseFk
+				AND r.orderFk = vSelf
 			ORDER BY r.rate DESC;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -62,11 +65,21 @@ BEGIN
 	END;
 
 	-- Carga los datos del pedido
-	SELECT o.date_send, o.address_id, o.note, a.clientFk,
-			o.company_id, o.agency_id, c.isTaxDataChecked
-		INTO vDelivery, vAddress, vNotes, vClientId,
-			vCompanyId, vAgencyModeId, vIsTaxDataChecked
-		FROM hedera.`order` o
+	SELECT o.date_send,
+			o.address_id,
+			o.note,
+			a.clientFk,
+			o.company_id,
+			o.agency_id,
+			c.isTaxDataChecked
+		INTO vLanded,
+			vAddressFk,
+			vNotes,
+			vClientFk,
+			vCompanyFk,
+			vAgencyModeFk,
+			vIsTaxDataChecked
+		FROM `order` o
 			JOIN vn.address a ON a.id = o.address_id
 			JOIN vn.client c ON c.id = a.clientFk
 		WHERE o.id = vSelf;
@@ -77,11 +90,11 @@ BEGIN
 	END IF;
 
 	-- Carga las fechas de salida de cada almacen
-	CALL vn.zone_getShipped (vDelivery, vAddress, vAgencyModeId, FALSE);
+	CALL vn.zone_getShipped(vLanded, vAddressFk, vAgencyModeFk, FALSE);
 
 	-- Trabajador que realiza la accion
-	IF vUserId IS NULL THEN
-		SELECT employeeFk INTO vUserId FROM orderConfig;
+	IF vUserFk IS NULL THEN
+		SELECT employeeFk INTO vUserFk FROM orderConfig;
 	END IF;
 
 	START TRANSACTION;
@@ -89,207 +102,188 @@ BEGIN
 	CALL order_checkEditable(vSelf);
 
 	-- Check order is not empty
+	SELECT COUNT(*) > 0 INTO vHasRows
+		FROM orderRow
+		WHERE orderFk = vSelf
+			AND amount > 0;
 
-	SELECT COUNT(*) > 0 INTO vOk
-		FROM order_row WHERE order_id = vSelf AND amount > 0;
-
-	IF NOT vOk THEN
+	IF NOT vHasRows THEN
 		CALL util.throw('ORDER_EMPTY');
 	END IF;
 
 	-- Crea los tickets del pedido
-
-	OPEN cDates;
-
-	lDates:
-	LOOP
-		SET vTicket = NULL;
+	OPEN vDates;
+	lDates: LOOP
+		SET vTicketFk = NULL;
 		SET vDone = FALSE;
-		FETCH cDates INTO vShipment, vWarehouse;
+		FETCH vDates INTO vShipment, vWarehouseFk;
 
 		IF vDone THEN
 			LEAVE lDates;
 		END IF;
 
-		-- Busca un ticket existente que coincida con los parametros
-		WITH tPrevia AS
-			(SELECT DISTINCT s.ticketFk
+		SET vShipmentDayEnd = util.dayEnd(vShipment);
+
+		-- Busca un ticket libre disponible
+		WITH tPrevia AS (
+			SELECT DISTINCT s.ticketFk
 				FROM vn.sale s
 					JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
 					JOIN vn.ticket t ON t.id = s.ticketFk
-				WHERE t.shipped BETWEEN vShipment AND util.dayend(vShipment)
+				WHERE t.shipped BETWEEN vShipment AND vShipmentDayEnd
 		)
-		SELECT t.id INTO vTicket
+		SELECT t.id INTO vTicketFk
 			FROM vn.ticket t
 				JOIN vn.alertLevel al ON al.code = 'FREE'
 				LEFT JOIN tPrevia tp ON tp.ticketFk = t.id
-				LEFT JOIN vn.ticketState tls on tls.ticketFk = t.id
-				JOIN hedera.`order` o
-					ON o.address_id = t.addressFk
-						AND vWarehouse = t.warehouseFk
+				LEFT JOIN vn.ticketState tls ON tls.ticketFk = t.id
+				JOIN hedera.`order` o ON o.address_id = t.addressFk
+					AND t.shipped BETWEEN vShipment AND vShipmentDayEnd
+					AND t.warehouseFk = vWarehouseFk
 					AND o.date_send = t.landed
-						AND DATE(t.shipped) = vShipment
 			WHERE o.id = vSelf
 				AND t.refFk IS NULL
 				AND tp.ticketFk IS NULL
 				AND (tls.alertLevel IS NULL OR tls.alertLevel = al.id)
 			LIMIT 1;
 
+		-- Comprobamos si hay un ticket de previa disponible
+		IF vTicketFk IS NULL THEN
+			WITH tItemPackingTypeOrder AS (
+				SELECT GROUP_CONCAT(
+							DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk
+						) distinctItemPackingTypes,
+						o.address_id
+					FROM vn.item i
+						JOIN hedera.orderRow oro ON oro.itemFk = i.id
+						JOIN hedera.`order` o ON o.id = oro.orderFk
+					WHERE oro.orderFk = vSelf
+			),
+			tItemPackingTypeTicket AS (
+				SELECT t.id,
+						GROUP_CONCAT(
+							DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk
+						) distinctItemPackingTypes
+					FROM vn.ticket t
+						JOIN vn.ticketState tls ON tls.ticketFk = t.id
+						JOIN vn.alertLevel al ON al.id = tls.alertLevel
+						JOIN vn.sale s ON s.ticketFk = t.id
+						JOIN vn.item i ON i.id = s.itemFk
+						JOIN tItemPackingTypeOrder ipto
+					WHERE t.shipped BETWEEN vShipment AND vShipmentDayEnd
+						AND t.refFk IS NULL
+						AND t.warehouseFk = vWarehouseFk
+						AND t.addressFk = ipto.address_id
+						AND al.code = 'ON_PREVIOUS'
+					GROUP BY t.id
+			)
+			SELECT iptt.id INTO vTicketFk
+				FROM tItemPackingTypeTicket iptt
+					JOIN tItemPackingTypeOrder ipto
+				WHERE INSTR(iptt.distinctItemPackingTypes, ipto.distinctItemPackingTypes)
+				LIMIT 1;
+		END IF;
+
 		-- Crea el ticket en el caso de no existir uno adecuado
-		IF vTicket IS NULL
-		THEN
-
+		IF vTicketFk IS NULL THEN
 			SET vShipment = IFNULL(vShipment, util.VN_CURDATE());
-
 			CALL vn.ticket_add(
-				vClientId,
+				vClientFk,
 				vShipment,
-				vWarehouse,
-				vCompanyId,
-				vAddress,
-				vAgencyModeId,
+				vWarehouseFk,
+				vCompanyFk,
+				vAddressFk,
+				vAgencyModeFk,
 				NULL,
-				vDelivery,
-				vUserId,
+				vLanded,
+				vUserFk,
 				TRUE,
-				vTicket
+				vTicketFk
 			);
 		ELSE
 			INSERT INTO vn.ticketTracking
-				SET ticketFk = vTicket,
-					userFk = vUserId,
-					stateFk = TICKET_FREE;
+				SET ticketFk = vTicketFk,
+					userFk = vUserFk,
+					stateFk = (SELECT id FROM vn.state WHERE code = 'FREE');
 		END IF;
 
 		INSERT IGNORE INTO vn.orderTicket
 			SET orderFk = vSelf,
-				ticketFk = vTicket;
+				ticketFk = vTicketFk;
 
 		-- Añade las notas
-
-		IF vNotes IS NOT NULL AND vNotes != ''
-		THEN
-			INSERT INTO vn.ticketObservation SET
-					ticketFk = vTicket,
-					observationTypeFk = 4 /* salesperson */ ,
+		IF vNotes IS NOT NULL AND vNotes <> '' THEN
+			INSERT INTO vn.ticketObservation
+				SET ticketFk = vTicketFk,
+					observationTypeFk = (SELECT id FROM vn.observationType WHERE code = 'salesPerson'),
 					`description` = vNotes
 				ON DUPLICATE KEY UPDATE
 					`description` = CONCAT(VALUES(`description`),'. ', `description`);
 		END IF;
 
 		-- Añade los movimientos y sus componentes
-
-		OPEN cRows;
-
+		OPEN vRows;
 		lRows: LOOP
+			SET vSaleFk = NULL;
 			SET vDone = FALSE;
-			FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate, vIsLogifloraItem;
+			FETCH vRows INTO vRowFk, vItemFk, vConcept, vAmount, vPrice;
 
 			IF vDone THEN
 				LEAVE lRows;
 			END IF;
 
-			SET vSale = NULL;
-
-			SELECT s.id, s.quantity INTO vSale, vOldQuantity
+			SELECT s.id INTO vSaleFk
 				FROM vn.sale s
-				WHERE ticketFk = vTicket
+				WHERE ticketFk = vTicketFk
 					AND price = vPrice
-					AND itemFk = vItem
+					AND itemFk = vItemFk
 					AND discount = 0
 				LIMIT 1;
 
-			IF vSale THEN
+			IF vSaleFk THEN
 				UPDATE vn.sale
 					SET quantity = quantity + vAmount,
 						originalQuantity = quantity
-					WHERE id = vSale;
-
-				SELECT s.quantity INTO vNewQuantity
-					FROM vn.sale s
-					WHERE id = vSale;
+					WHERE id = vSaleFk;
 			ELSE
 				-- Obtiene el coste
 				SELECT SUM(rc.`price`) valueSum INTO vPriceFixed
 					FROM orderRowComponent rc
 						JOIN vn.component c ON c.id = rc.componentFk
-						JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
-					WHERE rc.rowFk = vRowId;
+						JOIN vn.componentType ct ON ct.id = c.typeFk
+							AND ct.isBase
+					WHERE rc.rowFk = vRowFk;
 
 				INSERT INTO vn.sale
-					SET itemFk = vItem,
-						ticketFk = vTicket,
+					SET itemFk = vItemFk,
+						ticketFk = vTicketFk,
 						concept = vConcept,
 						quantity = vAmount,
 						price = vPrice,
 						priceFixed = vPriceFixed,
 						isPriceFixed = TRUE;
 
-				SET vSale = LAST_INSERT_ID();
+				SET vSaleFk = LAST_INSERT_ID();
 
-				INSERT INTO vn.saleComponent
-					(saleFk, componentFk, `value`)
-					SELECT vSale, rc.componentFk, rc.price
+				INSERT INTO vn.saleComponent (saleFk, componentFk, `value`)
+					SELECT vSaleFk, rc.componentFk, rc.price
 						FROM orderRowComponent rc
 							JOIN vn.component c ON c.id = rc.componentFk
-						WHERE rc.rowFk = vRowId
-						GROUP BY vSale, rc.componentFk;
+						WHERE rc.rowFk = vRowFk
+						GROUP BY vSaleFk, rc.componentFk;
 			END IF;
 
-			UPDATE order_row SET Id_Movimiento = vSale
-				WHERE id = vRowId;
-
-			-- Inserta en putOrder si la compra es de Floramondo
-			IF vIsLogifloraItem THEN
-				CALL cache.availableNoRaids_refresh(vCalc,FALSE,vWarehouse,vShipment);
-
-				SET @available := 0;
-
-				SELECT GREATEST(0,available) INTO @available
-					FROM cache.availableNoRaids
-					WHERE calc_id = vCalc
-						AND item_id = vItem;
-
-				UPDATE cache.availableNoRaids
-					SET available = GREATEST(0,available - vAmount)
-					WHERE item_id = vItem
-						AND calc_id = vCalc;
-
-				INSERT INTO edi.putOrder (
-						deliveryInformationID,
-						supplyResponseId,
-						quantity ,
-						EndUserPartyId,
-						EndUserPartyGLN,
-						FHAdminNumber,
-						saleFk
-					)
-					SELECT di.ID,
-							i.supplyResponseFk,
-							CEIL((vAmount - @available)/ sr.NumberOfItemsPerCask),
-							o.address_id ,
-							vClientId,
-							IFNULL(ca.fhAdminNumber, fhc.defaultAdminNumber),
-							vSale
-						FROM edi.deliveryInformation di
-							JOIN vn.item i ON i.supplyResponseFk = di.supplyResponseID
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							LEFT JOIN edi.clientFHAdminNumber ca ON ca.clientFk = vClientId
-							JOIN edi.floraHollandConfig fhc
-							JOIN hedera.`order` o ON o.id = vSelf
-						WHERE i.id = vItem
-							AND di.LatestOrderDateTime > util.VN_NOW()
-							AND vAmount > @available
-						LIMIT 1;
-			END IF;
+			UPDATE orderRow
+				SET saleFk = vSaleFk
+				WHERE id = vRowFk;
 		END LOOP;
-
-		CLOSE cRows;
+		CLOSE vRows;
 	END LOOP;
+	CLOSE vDates;
 
-	CLOSE cDates;
-
-	UPDATE `order` SET confirmed = TRUE, confirm_date = util.VN_NOW()
+	UPDATE `order`
+		SET confirmed = TRUE,
+			confirm_date = util.VN_NOW()
 		WHERE id = vSelf;
 
 	COMMIT;

db/routines/vn/procedures/item_getMinacum.sql

@@ -1,37 +1,40 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getMinacum`(IN vWarehouseFk TINYINT, IN vDatedFrom DATETIME, IN vRange INT, IN vItemFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getMinacum`(
+	vWarehouseFk TINYINT,
+	vDated DATE,
+	vRange INT,
+	vItemFk INT
+)
 BEGIN
 /**
- * Cálculo del mínimo acumulado, para un item/almacén especificado, en caso de
- * NULL para todo.
+ * Cálculo del mínimo acumulado, para un item/almacén
+ * especificado, en caso de NULL para todos.
  *
- * @param vWarehouseFk -> warehouseFk
- * @param vDatedFrom -> fecha inicio
- * @param vRange -> número de días a considerar
- * @param vItemFk -> Identificador de item
+ * @param vWarehouseFk Id warehouse
+ * @param vDated Fecha inicio
+ * @param vRange Número de días a considerar
+ * @param vItemFk Id de artículo
  * @return tmp.itemMinacum
 */
-	DECLARE vDatedTo DATETIME;
+	DECLARE vDatedTo DATETIME DEFAULT util.dayEnd(vDated + INTERVAL vRange DAY);
 
-	SET vDatedFrom = TIMESTAMP(DATE(vDatedFrom), '00:00:00');
-	SET vDatedTo = TIMESTAMP(TIMESTAMPADD(DAY, vRange, vDatedFrom), '23:59:59');
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc;
-	CREATE TEMPORARY TABLE tmp.itemCalc
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
 		(INDEX (itemFk, warehouseFk))
+		ENGINE = MEMORY
 		SELECT sub.itemFk,
 				sub.dated,
 				CAST(SUM(sub.quantity) AS SIGNED) quantity,
 				sub.warehouseFk
-			FROM (SELECT s.itemFk,
+			FROM (
+				SELECT s.itemFk,
 						DATE(t.shipped) dated,
 						-s.quantity quantity,
 						t.warehouseFk
 					FROM sale s
 						JOIN ticket t ON t.id = s.ticketFk
-					WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+					WHERE t.shipped BETWEEN vDated AND vDatedTo
 						AND t.warehouseFk
-						AND s.quantity != 0
+						AND s.quantity <> 0
 						AND (vItemFk IS NULL OR s.itemFk = vItemFk)
 						AND (vWarehouseFk IS NULL OR t.warehouseFk = vWarehouseFk)
 				UNION ALL
@@ -42,10 +45,10 @@ BEGIN
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
 						JOIN travel t ON t.id = e.travelFk
-					WHERE t.landed BETWEEN vDatedFrom AND vDatedTo
+					WHERE t.landed BETWEEN vDated AND vDatedTo
 						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
-						AND !e.isExcludedFromAvailable
-						AND b.quantity != 0
+						AND NOT e.isExcludedFromAvailable
+						AND b.quantity <> 0
 						AND (vItemFk IS NULL OR b.itemFk = vItemFk)
 				UNION ALL
 				SELECT b.itemFk,
@@ -55,28 +58,45 @@ BEGIN
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
 						JOIN travel t ON t.id = e.travelFk
-					WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+					WHERE t.shipped BETWEEN vDated AND vDatedTo
 						AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk)
-						AND !e.isExcludedFromAvailable
-						AND b.quantity != 0
+						AND NOT e.isExcludedFromAvailable
+						AND b.quantity <> 0
 						AND (vItemFk IS NULL OR b.itemFk = vItemFk)
-						AND !e.isRaid
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT r.itemFk,
+						r.shipment,
+						-r.amount,
+						r.warehouseFk
+					FROM hedera.orderRow r
+						JOIN hedera.`order` o ON o.id = r.orderFk
+						JOIN client c ON c.id = o.customer_id
+					WHERE r.shipment BETWEEN vDated AND vDatedTo
+						AND (vWarehouseFk IS NULL OR r.warehouseFk = vWarehouseFk)
+						AND r.created >= (
+							SELECT util.VN_NOW() - INTERVAL TIME_TO_SEC(reserveTime) SECOND
+								FROM hedera.orderConfig
+						)
+						AND NOT o.confirmed
+						AND (vItemFk IS NULL OR r.itemFk = vItemFk)
+						AND r.amount <> 0
 				) sub
 			GROUP BY sub.itemFk, sub.warehouseFk, sub.dated;
 
-	CALL item_getAtp(vDatedFrom);
-	DROP TEMPORARY TABLE tmp.itemCalc;
+	CALL item_getAtp(vDated);
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
-	CREATE TEMPORARY TABLE tmp.itemMinacum
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemMinacum
 		(INDEX(itemFk))
 		ENGINE = MEMORY
-		SELECT i.itemFk,
-				i.warehouseFk,
-				i.quantity amount
-			FROM tmp.itemAtp i
-			HAVING amount != 0;
+		SELECT itemFk,
+				warehouseFk,
+				quantity amount
+			FROM tmp.itemAtp
+			WHERE quantity <> 0;
 
-	DROP TEMPORARY TABLE tmp.itemAtp;
+	DROP TEMPORARY TABLE
+		tmp.itemAtp,
+		tmp.itemCalc;
 END$$
 DELIMITER ;