Estimado cliente,
- A continuación le enviamos el resumen menual de CMR ',UPPER(MONTHNAME(util.VN_CURDATE() - INTERVAL 1 MONTH)),' ', YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH), '.
+ A continuación le enviamos el resumen menual de CMR ',UPPER(MONTHNAME(CURDATE() - INTERVAL 1 MONTH)),' ', YEAR(CURDATE() - INTERVAL 1 MONTH), '.
Le rogamos que nos devuelva el resumen firmado a cmr@verdnatura.es
|
@@ -48968,8 +48946,8 @@ BEGIN
JOIN vn.address a ON c.addressToFk = a.id
JOIN vn.client c2 ON a.clientFk = c2.id
WHERE c.state = 'Pending'
- AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH)
- AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH)
+ AND MONTH(c.created) = MONTH(CURDATE() - INTERVAL 1 MONTH)
+ AND YEAR(c.created) = YEAR(CURDATE() - INTERVAL 1 MONTH)
AND c2.email IS NOT NULL -- No cogemos los CMRs dirigidos a 'Verdnatura'
GROUP BY c2.id;
@@ -48977,8 +48955,8 @@ BEGIN
UPDATE vn.cmr c
SET c.state = 'Sent'
WHERE c.state = 'Pending'
- AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH)
- AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH);
+ AND MONTH(c.created) = MONTH(CURDATE() - INTERVAL 1 MONTH)
+ AND YEAR(c.created) = YEAR(CURDATE() - INTERVAL 1 MONTH);
-- END IF;
END ;;
DELIMITER ;
@@ -48998,77 +48976,65 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `collectionPlacement_get`(vParamFk INT(11), vIsPicker bool)
BEGIN
-
- /* Devuelve el listado de ubicaciones a las que hay que ir para preparar una colección o ticket
- *
- * @param vParamFk Identificador de vn.collection o Identificador de vn.ticket
- * @param vIsPicker Booleano para distinguer el sacador del revisador
- */
+/** Devuelve el listado de ubicaciones a las que hay que ir para preparar una colección o ticket
+ *
+ * @param vParamFk Identificador de vn.collection o Identificador de vn.ticket
+ * @param vIsPicker Booleano para distinguer el sacador del revisador
+ */
DECLARE vCalcFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vWarehouseAliasFk INT;
- DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- ENGINE = MEMORY
- SELECT 00000000 as ticketFk,
+ DECLARE vWarehouseFk INT;
+ DECLARE vWarehouseAliasFk INT;
+ DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ ENGINE = MEMORY
+ SELECT 00000000 as ticketFk,
00000000 as saleFk,
- 00000000 as itemFk,
- FALSE as isStowaway,
- 0 as quantity;
-
- INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ 00000000 as itemFk,
+ 0 as quantity;
+ -- 0 AS visible;
+
+ INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, quantity)
+ SELECT s.ticketFk, s.id, s.itemFk, s.quantity
FROM vn.ticketCollection tc
- -- JOIN vn.collection c ON c.id = tc.collectionFk
JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- -- JOIN vn.item i ON i.id = s.itemFk
WHERE tc.collectionFk = vParamFk
- -- AND (IFNULL(i.itemPackingTypeFk,c.itemPackingTypeFk) = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
UNION ALL
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ SELECT s.ticketFk, s.id, s.itemFk, s.quantity
FROM vn.sale s
WHERE s.ticketFk = vParamFk;
-
- SELECT t.warehouseFk, w.aliasFk
+
+ SELECT t.warehouseFk, w.aliasFk
INTO vWarehouseFk, vWarehouseAliasFk
- FROM vn.ticket t
+ FROM vn.ticket t
JOIN tmp.sale ts ON ts.ticketFk = t.id
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- LIMIT 1;
-
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ LIMIT 1;
+
CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
-
- UPDATE tmp.sale ts
- JOIN ( SELECT itemFk, sum(visible) as visible
- FROM vn.itemShelvingStock iss
- JOIN vn.warehouse w ON w.id = iss.warehouseFk
- WHERE w.aliasFk = vWarehouseAliasFk
- GROUP BY iss.itemFk ) iss ON iss.itemFk = ts.itemFk
- SET ts.quantity = iss.visible;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
- CREATE TEMPORARY TABLE tmp.sale2
- ENGINE = MEMORY
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
+ CREATE TEMPORARY TABLE tmp.sale2
+ ENGINE = MEMORY
SELECT * FROM tmp.sale;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
- CREATE TEMPORARY TABLE tmp.`grouping`
+ CREATE TEMPORARY TABLE tmp.`grouping`
(INDEX(itemFk))
- ENGINE = MEMORY
+ ENGINE = MEMORY
SELECT b.itemFk,
CASE b.groupingMode
WHEN 0 THEN 1
WHEN 2 THEN b.packing
ELSE b.`grouping`
- END AS `grouping`
+ END AS `grouping`
FROM buy b
JOIN cache.last_buy lb ON lb.buy_id = b.id
WHERE lb.warehouse_id = vWarehouseFk
GROUP BY b.itemFk;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
CREATE TEMPORARY TABLE tmp.grouping2
ENGINE MEMORY
@@ -49078,93 +49044,96 @@ BEGIN
CREATE TEMPORARY TABLE tmp.salePlacementList
ENGINE MEMORY
- SELECT ts.saleFk,
+ SELECT ts.saleFk,
ts.itemFk,
CAST(0 AS DECIMAL(10,0)) as saleOrder,
- IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) /* + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,util.VN_NOW())) */) as priority,
- CONCAT(
- IF( iss.id,
- CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
- ''),
- p.`code`) COLLATE utf8_general_ci as placement ,
- sh.priority shelvingPriority,
+ IF(ish.visible > 0 OR iss.id, 1, 100000) * p.pickingOrder as `order`,
+ IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) /* + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW())) */) as priority,
+ CONCAT(
+ IF( iss.id,
+ CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
+ ''),
+ p.`code`) COLLATE utf8_general_ci as placement,
+ sh.priority shelvingPriority,
sh.code COLLATE utf8_general_ci as shelving,
ish.created,
ish.visible,
IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- sc.isPreviousPrepared,
- iss.id as itemShelvingSaleFk,
- ts.ticketFk
- ,iss.id
- , st.saleFk as salePreviousPrepared
- , iss.userFk
+ sc.isPreviousPrepared,
+ iss.id as itemShelvingSaleFk,
+ ts.ticketFk
+ ,iss.id
+ , st.saleFk as salePreviousPrepared
+ , iss.userFk
+ , ts.quantity
FROM tmp.sale ts
LEFT JOIN (SELECT DISTINCT saleFk
FROM vn.saleTracking st
JOIN vn.state s ON s.id = st.stateFk
WHERE st.isChecked
AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
- JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector sc ON sc.id = p.sectorFk
- JOIN vn.warehouse w ON w.id = sc.warehouseFk
- LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
- LEFT JOIN vn.worker wk ON wk.id = iss.userFk
+ JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector sc ON sc.id = p.sectorFk
+ JOIN vn.warehouse w ON w.id = sc.warehouseFk
+ LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
+ LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
+ LEFT JOIN vn.worker wk ON wk.id = iss.userFk
WHERE w.aliasFk = vWarehouseAliasFk
- AND NOT sc.isHideForPickers
- HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
- ;
-
-
+ AND NOT sc.isHideForPickers
+ HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
+ ;
+
DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_2;
CREATE TEMPORARY TABLE tmp.salePlacementList_2
ENGINE MEMORY
- SELECT saleFk, priority as olderPriority
+ SELECT saleFk, priority as olderPriority
FROM (SELECT saleFk, priority
FROM tmp.salePlacementList
- ORDER BY IF(isPreviousPrepared,2,1),
- IF(visible > 0 OR itemShelvingSaleFk,1,2),
- IFNULL(shelvingPriority,0) DESC,
+ ORDER BY isPreviousPrepared DESC,
+ itemShelvingSaleFk IS NULL DESC,
+ visible >= quantity DESC,
+ visible > 0 DESC,
+ IFNULL(shelvingPriority,0) DESC,
priority
LIMIT 10000000000000000000
) sub
- GROUP BY saleFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
+ GROUP BY saleFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
CREATE TEMPORARY TABLE tmp.salePlacementList_3
ENGINE MEMORY
- SELECT s1.saleFk, `order`as saleOrder
+ SELECT s1.saleFk, `order`as saleOrder
FROM tmp.salePlacementList s1
JOIN tmp.salePlacementList_2 s2 ON s2.saleFk = s1.saleFk AND s2.olderPriority = s1.priority;
-
- UPDATE tmp.salePlacementList s1
+
+ UPDATE tmp.salePlacementList s1
JOIN tmp.salePlacementList_3 s3 ON s3.saleFk = s1.saleFk
- SET s1.saleOrder = s3.saleOrder;
- /*
- -- Anula el orden de antigüedad y ordena por ubicación
- UPDATE tmp.salePlacementList
- SET saleOrder = `order`;*/
-
- SELECT *
- FROM tmp.salePlacementList
- ORDER BY saleOrder,
- IF(isPreviousPrepared,2,1),
- IF(itemShelvingSaleFk,1,2),
- IF(vIsPicker, visible = 0, TRUE),
- shelvingPriority DESC, -- PAK 05/11/2021
- priority;
-
+ SET s1.saleOrder = s3.saleOrder;
+ /*
+ -- Anula el orden de antigüedad y ordena por ubicación
+ UPDATE tmp.salePlacementList
+ SET saleOrder = `order`;*/
+
+ SELECT spl.*
+ FROM tmp.salePlacementList spl
+ JOIN vn.sale s ON s.id = spl.saleFk
+ ORDER BY saleOrder,
+ isPreviousPrepared DESC,
+ itemShelvingSaleFk,
+ IF(vIsPicker, visible = 0, TRUE),
+ s.quantity <= spl.visible DESC,
+ shelvingPriority DESC, -- PAK 05/11/2021
+ priority;
+
DROP TEMPORARY TABLE
tmp.sale,
- tmp.sale2,
- tmp.`grouping`,
- tmp.grouping2,
- tmp.salePlacementList_2,
- tmp.salePlacementList_3;
-
+ tmp.sale2,
+ tmp.`grouping`,
+ tmp.grouping2,
+ tmp.salePlacementList_2,
+ tmp.salePlacementList_3;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -49192,7 +49161,7 @@ BEGIN
SELECT barcodeToItem(vItemFk) INTO itemFk;
- SELECT CONCAT(vn.getUser()," ",DATE_FORMAT(util.VN_NOW( ), "%H:%i" )," ",i.name) INTO vConcept FROM vn.item i WHERE i.id = itemFk;
+ SELECT CONCAT(vn.getUser()," ",DATE_FORMAT(NOW( ), "%H:%i" )," ",i.name) INTO vConcept FROM vn.item i WHERE i.id = itemFk;
SELECT name INTO vItemName FROM vn.item WHERE id = vItemFk;
SELECT CONCAT("Añadido articulo ", vItemName, " cantidad:", vQuantity) INTO vDescription;
@@ -49238,7 +49207,7 @@ BEGIN
JOIN vn.state ss on ss.code = 'PREPARED'
LEFT JOIN vn.saleTracking st on st.saleFk = s.id AND st.stateFk = ss.id
WHERE c.workerFk = vWorkerFk
- AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW())
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
AND s.quantity != 0
GROUP BY c.id
HAVING totalRow > pickedRow;
@@ -49344,7 +49313,7 @@ BEGIN
FROM vn.collection c
LEFT JOIN vn.state s ON c.stateFk = s.id
WHERE c.workerFk = vWorkerFk AND s.code = 'ON_PREPARATION'
- AND created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW());
+ AND created >= TIMESTAMPADD(HOUR , -6,NOW());
END ;;
@@ -49395,59 +49364,117 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_missingTrash`(vSaleFk BIGINT, vQuantity INT, vIsTrash BOOLEAN, vWarehouseFk INT, vNewQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_missingTrash`(
+ vSaleFk BIGINT,
+ vQuantity INT,
+ vIsTrash BOOLEAN,
+ vWarehouseFk INT,
+ vNewQuantity INT)
BEGIN
+/**
+* Modifica la cantidad de una sale tirándola a faltas o basura
+*
+* @param vSaleFk el id de la sale
+* @param vQuantity cantidad que se va a tirar a faltas o basura
+* @param vWarehouseFk id warehouse
+* @param vNewQuantity cantidad que se queda en el ticket original
+*/
DECLARE vTicketFk INT;
DECLARE vClientFk INT DEFAULT 400;
- DECLARE vClientName VARCHAR(50);
- DECLARE vConsignatario INT;
- DECLARE vOriginalQuantity INT;
- DECLARE vDescription VARCHAR(100);
- DECLARE vConcept VARCHAR(100);
- DECLARE vOrigin INT;
+ DECLARE vClientName VARCHAR(50);
+ DECLARE vConsignatario INT;
+ DECLARE vOriginalQuantity INT;
+ DECLARE vDescription VARCHAR(100);
+ DECLARE vCompanyVnlFk INT;
+ DECLARE vOrigin INT;
IF vIsTrash THEN
- SELECT 200 INTO vClientFk;
+ SELECT id INTO vClientFk
+ FROM client c
+ WHERE c.name='BASURA';
END IF;
-
- SELECT concept INTO vConcept FROM vn.sale WHERE id = vSaleFk;
- SELECT ticketFk INTO vOrigin FROM vn.sale WHERE id = vSaleFk;
- SELECT CONCAT("Cambio cantidad ",vConcept," de ", vQuantity ," a ", vNewQuantity) INTO vDescription;
-
- INSERT INTO vn.ticketLog (originFk, userFk, action , description)
- VALUES(vOrigin, vn.getUser(), 'update', vDescription);
- SELECT t.id INTO vTicketFk FROM vn.ticket t WHERE t.created > DATE_SUB(util.VN_NOW(), INTERVAL 1 DAY) AND t.clientFk = vClientFk AND t.warehouseFk = vWarehouseFk LIMIT 1;
-
- IF vTicketFk IS NULL THEN
- SELECT c.name , co.id INTO vClientName,vConsignatario
- FROM vn.client c
- INNER JOIN vn.address co ON c.id = co.clientFk
- WHERE c.id = vClientFk
- LIMIT 1;
-
- CALL ticket_add(vClientFk,
- util.VN_NOW(), vWarehouseFk,
- 442,
- vConsignatario,
- NULL,
- NULL,
- NULL,
- account.myUser_getId(),
- TRUE,
- vTicketFk);
-
- SELECT t.id INTO vTicketFk FROM vn.ticket t WHERE t.created > DATE_SUB(util.VN_NOW(), INTERVAL 1 DAY) AND t.clientFk = vClientFk AND t.warehouseFk = vWarehouseFk LIMIT 1;
-
- END IF;
-
- INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded)
- SELECT itemFk, vTicketFk, CONCAT(concept," ",vn.getWorkerCode(), " ",LEFT(CAST(util.VN_NOW() AS TIME),5)), vQuantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded
- FROM vn.sale s WHERE s.id = vSaleFk;
-
- SELECT quantity INTO vOriginalQuantity FROM vn.sale WHERE id = vSaleFk;
- UPDATE vn.sale SET originalQuantity = vOriginalQuantity ,quantity = vNewQuantity WHERE id = vSaleFk;
-
+ SELECT CONCAT("Cambio cantidad del artículo ",itemFk, ", ",concept,", de ", quantity," a ", vNewQuantity), ticketFk
+ INTO vDescription,vOrigin
+ FROM sale
+ WHERE id = vSaleFk;
+
+ CALL logAdd(vOrigin, 'update', 'ticket', vDescription);
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ WHERE t.created > DATE_SUB(NOW(), INTERVAL 1 DAY)
+ AND t.clientFk = vClientFk
+ AND t.warehouseFk = vWarehouseFk
+ LIMIT 1;
+
+ IF vTicketFk IS NULL THEN
+ SELECT c.name , co.id INTO vClientName,vConsignatario
+ FROM client c
+ JOIN address co ON c.id = co.clientFk
+ WHERE c.id = vClientFk
+ LIMIT 1;
+
+ SELECT id INTO vCompanyVnlFk
+ FROM company
+ WHERE code = 'VNL';
+
+ CALL ticket_add(vClientFk,
+ NOW(), vWarehouseFk,
+ vCompanyVnlFk,
+ vConsignatario,
+ NULL,
+ NULL,
+ NULL,
+ account.myUser_getId(),
+ TRUE,
+ vTicketFk);
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ WHERE t.created > DATE_SUB(NOW(), INTERVAL 1 DAY)
+ AND t.clientFk = vClientFk
+ AND t.warehouseFk = vWarehouseFk
+ LIMIT 1;
+ END IF;
+
+ INSERT INTO sale (itemFk,
+ ticketFk,
+ concept,
+ quantity,
+ originalQuantity,
+ price,
+ discount,
+ priceFixed,
+ reserved,
+ isPicked,
+ isPriceFixed,
+ created,
+ isAdded)
+ SELECT itemFk,
+ vTicketFk,
+ CONCAT(concept," ",getWorkerCode(), " ", LEFT(CAST(NOW() AS TIME),5)),
+ vQuantity,
+ originalQuantity,
+ price,
+ discount,
+ priceFixed,
+ reserved,
+ isPicked,
+ isPriceFixed,
+ created,
+ isAdded
+ FROM sale s
+ WHERE s.id = vSaleFk;
+
+ SELECT quantity INTO vOriginalQuantity
+ FROM sale
+ WHERE id = vSaleFk;
+
+ UPDATE sale
+ SET originalQuantity = vOriginalQuantity,
+ quantity = vNewQuantity
+ WHERE id = vSaleFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -49592,7 +49619,7 @@ proc:BEGIN
JOIN vn.state ss ON ss.code = 'PREPARED'
LEFT JOIN vn.saleTracking st ON st.saleFk = s.id AND st.stateFk = ss.id
WHERE c.workerFk = vUserFk
- AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW())
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
AND s.quantity != 0
GROUP BY c.id
HAVING totalRow > pickedRow) sub;
@@ -49711,7 +49738,7 @@ proc:BEGIN
JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
JOIN vn.agency a ON a.id = am.agencyFk
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (pb.ubicacion IS NOT NULL
OR a.isOwn = FALSE )
AND s.isPreparable
@@ -49737,7 +49764,7 @@ proc:BEGIN
JOIN vn.ticket t ON t.id = pb.ticketFk
JOIN vn.ticketConfig tc
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (LENGTH(pb.problem) = 0
OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
AND (pb.ubicacion IS NOT NULL
@@ -49749,7 +49776,7 @@ proc:BEGIN
OR (pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV))
OR (pb.H = 0 AND pb.V = 0 AND pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV))
)
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , util.VN_NOW())
+ AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
AND (pc.isPreviousPreparationRequired = FALSE
OR pb.previousWithoutParking = FALSE)
ORDER BY HH,
@@ -50156,7 +50183,7 @@ proc:BEGIN
DECLARE vTrainFk INT DEFAULT 1;
DECLARE vNow DATETIME;
- SELECT ticketPrintedMax * vWagons, ticketTrolleyMax * vWagons, pc.maxNotReadyCollections , util.VN_NOW()
+ SELECT ticketPrintedMax * vWagons, ticketTrolleyMax * vWagons, pc.maxNotReadyCollections , NOW()
INTO vMaxTicketPrinted, vMaxTickets, vMaxNotReadyCollections, vNow
FROM vn.productionConfig pc;
@@ -50189,7 +50216,7 @@ proc:BEGIN
JOIN vn.state ss ON ss.code = 'PREPARED'
LEFT JOIN vn.saleTracking st ON st.saleFk = s.id AND st.stateFk = ss.id
WHERE c.workerFk = vUserFk
- AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW())
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
AND s.quantity != 0
GROUP BY c.id
HAVING totalRow > pickedRow) sub;
@@ -50310,7 +50337,7 @@ call util.debugAdd('wargo',CONCAT('vNotReadyCollections ',vNotReadyCollections))
JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
JOIN vn.agency a ON a.id = am.agencyFk
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (pb.ubicacion IS NOT NULL
OR a.isOwn = FALSE )
AND s.isPreparable
@@ -50339,7 +50366,7 @@ call util.debugAdd('wargo',CONCAT('vPrintedTickets ',vPrintedTickets));
JOIN vn.ticket t ON t.id = pb.ticketFk
JOIN vn.ticketConfig tc
JOIN vn.productionConfig pc
- WHERE pb.shipped = util.VN_CURDATE()
+ WHERE pb.shipped = CURDATE()
AND (LENGTH(pb.problem) = 0
OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
AND (pb.ubicacion IS NOT NULL
@@ -50351,7 +50378,7 @@ call util.debugAdd('wargo',CONCAT('vPrintedTickets ',vPrintedTickets));
OR (pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV))
OR (pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV))
)
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , util.VN_NOW())
+ AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
AND (pc.isPreviousPreparationRequired = FALSE
OR pb.previousWithoutParking = FALSE)
ORDER BY HH,
@@ -50812,9 +50839,15 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_setParking`(IN `vCollectionFk` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
+/**
+ * Aparca una colección en un parking.
+ *
+ * @param vCollectionFk Id de la colección
+ * @param vParkingFk Id del parking
+ */
REPLACE vn.ticketParking(ticketFk, parkingFk)
SELECT tc.ticketFk, vParkingFk
- FROM vn.ticketCollection tc
+ FROM vn.ticketCollection tc
WHERE tc.collectionFk = vCollectionFk;
END ;;
DELIMITER ;
@@ -51184,93 +51217,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `dayMinuteWorker` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `dayMinuteWorker`(vDateFrom DATETIME, vDateTo DATETIME)
-BEGIN
-
- DECLARE vDateStart DATE DEFAULT vDateFrom;
- DECLARE vDateEnd DATETIME DEFAULT util.dayEnd(vDateTo);
-
- SET @ordr := 0;
- SET @user := 0;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.dayMinuteWorker;
- CREATE TEMPORARY TABLE tmp.dayMinuteWorker
- SELECT sub3.id,
- sub3.hh `Hour`,
- sub3.mm Minut,
- sub3.userFk,
- sub3.code workerCode,
- sub3.firstname name,
- sub3.lastName surnames,
- sub3.workcenterFk center,
- w.name centerName,
- w2.name warehouseName,
- w2.hasProduction production
- FROM vn.workCenter w
- JOIN(SELECT id,
- hh,
- mm,
- userFk,
- code,
- firstname,
- lastName,
- @ordr := IF(@user != userFk,0,@ordr),
- IF(@ordr MOD 2, 'presente','--') state,
- @ordr := IFNULL(sub2.`order`,@ordr),
- @user := IFNULL(sub2.`userFk`,@user),
- workcenterFk
- FROM(SELECT dm.id,
- dm.hh,
- dm.mm,
- users.userFk,
- sub.`order`,
- users.code,
- firstName,
- lastName,
- users.workcenterFk
- FROM dayMinute dm
- JOIN(SELECT DISTINCT wtc.userFk ,
- code ,
- firstName,
- lastName,
- wl.workCenterFk
- FROM vn.workerTimeControl wtc
- JOIN vn.worker w ON w.userFk = wtc.userFk
- JOIN vn.workerLabour wl ON wl.workerFK = w.id
- AND wtc.timed BETWEEN wl.started AND IFNULL(wl.ended, util.VN_CURDATE())
- WHERE wtc.timed BETWEEN vDateStart AND vDateEnd
- ) users
- LEFT JOIN(SELECT `order`,
- wtc.userFk,
- hour(wtc.timed) * 100 + minute(wtc.timed) as dayMinuteFk
- FROM vn.workerTimeControl wtc
- WHERE wtc.timed BETWEEN vDateStart AND vDateEnd
- ORDER BY wtc.userFk, `order`
- ) sub ON sub.dayMinuteFk = dm.id AND sub.userFk = users.userFk
- ORDER BY userFk,dm.id
- ) sub2
- ) sub3 ON sub3.workcenterFk = w.id
- JOIN vn.warehouse w2 ON w2.id = w.warehouseFk
- WHERE state = 'presente'
- AND sub3.id BETWEEN HOUR(vDateFrom) *100 + MINUTE(vDateFrom)
- AND HOUR(vDateTo) *100 + MINUTE(vDateTo);
-
- END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `department_calcTree` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -51900,7 +51846,7 @@ BEGIN
DECLARE vDiff DECIMAL(10,2);
DECLARE vApunte BIGINT;
- SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE()) INTO vBookNumber, vBookDated
+ SELECT ASIEN, IFNULL(bookEntried, CURDATE()) INTO vBookNumber, vBookDated
FROM dua
WHERE id = vDuaFk;
@@ -52136,13 +52082,13 @@ DECLARE done INT DEFAULT FALSE;
DECLARE vEntryFk INT;
DECLARE vTravelFk INT;
DECLARE vId INT;
-DECLARE vLanded DATE DEFAULT util.VN_CURDATE();
+DECLARE vLanded DATE DEFAULT CURDATE();
DECLARE cur1 CURSOR FOR SELECT id FROM vn.ektEntryAssign;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- IF HOUR(util.VN_NOW()) > 12 THEN
+ IF HOUR(NOW()) > 12 THEN
SET vLanded = TIMESTAMPADD(DAY,1,vLanded);
@@ -52166,7 +52112,7 @@ OPEN cur1;
JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
AND ea.supplierFk = e.supplierFk
WHERE ea.id = vId
AND tr.landed = vLanded
@@ -52179,7 +52125,7 @@ OPEN cur1;
JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
WHERE ea.id = vId
AND tr.landed = vLanded
AND ea.supplierFk IS NULL
@@ -52195,13 +52141,13 @@ OPEN cur1;
FROM vn.travel tr
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
+ AND ea.agencyModeFk = tr.agencyModeFk
WHERE ea.id = vId
AND tr.landed = vLanded;
IF NOT vTravelFk THEN
- INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
+ INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk
FROM vn.ektEntryAssign
WHERE id = vId;
@@ -52265,7 +52211,7 @@ BEGIN
INSERT INTO vn.energyMeter
SET
`input` = vInput,
- `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'),
+ `period` = DATE_FORMAT(NOW(), '%Y-%m-%d %H:00:00'),
`activeTime` = vActiveTime,
`consumption` = CAST(IFNULL((vConsumption / 3600) * vActiveTime, 0) AS DECIMAL(10,2))
ON DUPLICATE KEY UPDATE
@@ -52303,8 +52249,8 @@ BEGIN
ELSE
- INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyFk, ref, isDelivered, isReceived)
- SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE
+ INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, ref, isDelivered, isReceived)
+ SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyModeFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE
FROM vn.travel WHERE id = vTravelFk;
SELECT LAST_INSERT_ID() INTO vTravelFk;
@@ -52371,7 +52317,7 @@ BEGIN
SELECT t.id, e.id INTO vTravel, vEntry
FROM travel t LEFT JOIN entry e ON t.id = e.travelFk
WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse
- AND t.warehouseInFk = vLandingWarehouse AND t.agencyFk IS NULL AND e.supplierFk = vSupplierFk
+ AND t.warehouseInFk = vLandingWarehouse AND t.agencyModeFk IS NULL AND e.supplierFk = vSupplierFk
LIMIT 1;
-- creamos el travel si es necesario
@@ -52494,55 +52440,55 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `entry_cloneWithoutBuy` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_cloneWithoutBuy`(vSelf INT, OUT vNewEntryFk INT)
BEGIN
-
/**
* Clona una entrada sin compras
*
* @param vSelf Identificador de vn.entry
- *
- * @return vNewEntryFk Identificador de la nueva entrada
+ * @param vNewEntryFk Identificador de la nueva entrada
*/
-
START TRANSACTION;
- INSERT INTO vn.entry(supplierFk,
- dated,
- isInventory,
- notes,
- isRaid,
- commission,
- travelFk,
- currencyFk,
- companyFk,
- loadPriority)
+ INSERT INTO vn.entry(
+ supplierFk,
+ dated,
+ isExcludedFromAvailable,
+ notes,
+ isRaid,
+ commission,
+ travelFk,
+ currencyFk,
+ companyFk,
+ loadPriority,
+ `ref`
+ )
SELECT supplierFk,
dated,
- isInventory,
+ isExcludedFromAvailable,
notes,
isRaid,
commission,
travelFk,
- currencyFk,
+ currencyFk,
companyFk,
- loadPriority
+ loadPriority,
+ `ref`
FROM vn.entry e
WHERE e.id = vSelf;
-
+
SET vNewEntryFk = LAST_INSERT_ID();
COMMIT;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -52695,6 +52641,8 @@ BEGIN
*/
DECLARE vNewTravelFk INT;
DECLARE vTravelFk INT;
+ DECLARE vInvoiceAmountOldEntryFk DECIMAL(10,2);
+ DECLARE vInvoiceAmountNewEntry DECIMAL(10,2);
SELECT travelFk INTO vTravelFk
FROM vn.entry
@@ -52822,6 +52770,26 @@ BEGIN
AND printedStickers != stickers;
END IF;
+ SELECT SUM(IFNULL(b.buyingValue * b.quantity, 0)) INTO vInvoiceAmountOldEntryFk
+ FROM vn.buy b
+ WHERE b.entryFk = vSelf;
+
+ UPDATE vn.entry e
+ JOIN vn.buy b ON b.entryFk = e.id
+ SET e.ref = CONCAT(e.ref,'(1)'),
+ e.invoiceAmount = vInvoiceAmountOldEntryFk
+ WHERE e.id = vSelf;
+
+ SELECT SUM(IFNULL(b.buyingValue * b.quantity, 0)) INTO vInvoiceAmountNewEntry
+ FROM vn.buy b
+ WHERE b.entryFk = vNewEntryFk;
+
+ UPDATE vn.entry e
+ JOIN vn.buy b ON b.entryFk = e.id
+ SET e.ref = CONCAT(e.ref,'(2)'),
+ e.invoiceAmount = vInvoiceAmountNewEntry
+ WHERE e.id = vNewEntryFk;
+
INSERT INTO entryLog
SET action = 'update',
description = CONCAT('Se ha creado la entrada ', vNewEntryFk,' transferida desde la ', vSelf),
@@ -52851,33 +52819,33 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_notifyChanged`(vSelf INT, vBuyFk INT, vOldValues VARCHAR(512), vNewValues VARCHAR(512))
BEGIN
- DECLARE vEmail VARCHAR(255);
- DECLARE vFields VARCHAR(100);
- DECLARE vMessage TEXT;
+ DECLARE vEmail VARCHAR(255);
+ DECLARE vFields VARCHAR(100);
+ DECLARE vMessage TEXT;
- SELECT e.mailToNotify INTO vEmail
- FROM entryConfig e
- LIMIT 1;
+ SELECT e.mailToNotify INTO vEmail
+ FROM entryConfig e
+ LIMIT 1;
- SET vFields = CONCAT_WS(',',
- 'entryFk',
- 'itemFk',
- 'quantity',
- 'price1',
- 'price2',
- 'price3'
- );
- SET vMessage = util.formatTable(vFields, vOldValues, vNewValues);
+ SET vFields = CONCAT_WS(',',
+ 'entryFk',
+ 'itemFk',
+ 'quantity',
+ 'price1',
+ 'price2',
+ 'price3'
+ );
+ SET vMessage = util.formatTable(vFields, vOldValues, vNewValues);
- CALL mail_insert(
- vEmail,
- NULL,
- CONCAT(
- 'Se ha modificado una línea de la entrada ', vSelf
- ,' siendo inventario o anterior al mismo'
- ),
- vMessage
- );
+ CALL mail_insert(
+ vEmail,
+ NULL,
+ CONCAT(
+ 'Se ha modificado una línea de la entrada ', vSelf
+ ,' siendo inventario o anterior al mismo'
+ ),
+ vMessage
+ );
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53126,22 +53094,27 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `errorProduction_add` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add`(vAction VARCHAR(25), vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add`(
+ vAction VARCHAR(25),
+ vDatedFrom DATETIME,
+ vDatedTo DATETIME)
BEGIN
-
/**
- * Fill in the errorProduction table
- */
-
+ * Rellena la tabla vn.errorProduction
+ *
+ * @param vAction Accion que se quiere añadir
+ * @param vDatedFrom Fecha desde
+ * @param vDatedTo Fecha hasta
+ */
DECLARE vDepartment VARCHAR(255);
DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
@@ -53181,7 +53154,8 @@ BEGIN
JOIN vncontrol.accion a ON a.accion_id = st.actionFk
JOIN sale s ON s.id = st.saleFk
JOIN ticket t ON s.ticketFk = t.id
- WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) AND a.accion = vAction
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ AND a.accion = vAction
GROUP BY st.workerFk;
END IF;
@@ -53215,8 +53189,8 @@ BEGIN
SELECT st.workerFk,
t.id
FROM saleMistake sm
- JOIN saleTracking st ON sm.saleFk = st.saleFk
- JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+ JOIN saleTracking st ON sm.saleFk = st.saleFk
+ JOIN vncontrol.accion a ON a.accion_id = st.actionFk
JOIN sale s ON s.id = sm.saleFk
JOIN ticket t on t.id = s.ticketFk
WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
@@ -53224,29 +53198,47 @@ BEGIN
GROUP BY s.ticketFk
) sub1
GROUP BY sub1.workerFk;
-
- INSERT INTO errorProduction(userFk, firstname, lastname, rol, ticketNumber, lineNumber, error, volume, hourStart, hourEnd, hourWorked, dated)
- SELECT w.id,
- w.firstName,
- w.lastName,
- vDepartment,
- t.ticketCount totalTickets,
- t.lineCount,
- IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
- IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
- SUBSTRING(tc.timed, 1, 5) hourStart,
- SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
- IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
- vDatedFrom dated
- FROM tmp.total t
- LEFT JOIN worker w ON w.id = t.workerFk
- LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
- LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
- LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
- LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
- GROUP BY w.id;
-
+
IF (vDepartment = 'Sacadores') THEN
+
+ INSERT INTO errorProduction(userFk,
+ firstname,
+ lastname,
+ rol,
+ ticketNumber,
+ lineNumber,
+ error,
+ volume,
+ hourStart,
+ hourEnd,
+ hourWorked,
+ dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ vDepartment,
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
+ IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
+ SUBSTRING(tc.timed, 1, 5) hourStart,
+ SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ JOIN (SELECT DISTINCT w.id -- Verificamos que son sacadores
+ FROM vn.collection c
+ JOIN vn.state s ON s.id = c.stateFk
+ JOIN vn.train tn ON tn.id = c.trainFk
+ JOIN vn.worker w ON w.id = c.workerFk
+ WHERE c.created BETWEEN vDatedFrom AND vDatedTo) sub ON sub.id = w.id
+ GROUP BY w.id;
+
CREATE TEMPORARY TABLE tmp.itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores
ENGINE = MEMORY
SELECT COUNT(c.ticketFk) errors,
@@ -53261,12 +53253,43 @@ BEGIN
AND cr.description = 'Revisadores'
AND s.code = 'ON_PREPARATION'
GROUP BY workerFk;
-
+
UPDATE errorProduction ep
JOIN tmp.itemPickerErrors ipe ON ipe.workerFk = ep.userFk
SET ep.error = ep.error + ipe.errors
WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores';
-
+ ELSE
+ INSERT INTO errorProduction(userFk,
+ firstname,
+ lastname,
+ rol,
+ ticketNumber,
+ lineNumber,
+ error,
+ volume,
+ hourStart,
+ hourEnd,
+ hourWorked,
+ dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ vDepartment,
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
+ IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
+ SUBSTRING(tc.timed, 1, 5) hourStart,
+ SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ GROUP BY w.id;
END IF;
DROP TEMPORARY TABLE tmp.timeControlCalculate;
@@ -53275,7 +53298,6 @@ BEGIN
DROP TEMPORARY TABLE tmp.errorsByClaim;
DROP TEMPORARY TABLE tmp.volume;
DROP TEMPORARY TABLE tmp.errorsByChecker;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53297,7 +53319,7 @@ BEGIN
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
- SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
+ SELECT DATE_SUB(CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
CALL vn.errorProduction_add('SACAR', vDatedFrom, vDatedTo);
CALL vn.errorProduction_add('ENCAJAR', vDatedFrom, vDatedTo);
@@ -53416,26 +53438,39 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_printLabel`(vSelf INT)
BEGIN
-
+/**
+ * Inserta en la cola de impresión teniendo en cuenta el sector de trabajador
+ * la expedición que se pasa como variable al procedimiento vSelf.
+ *
+ * @param vSelf identificador de expedition pallet
+ */
DECLARE vReport INT;
DECLARE vPrinterFk INT;
+ SET vReport = NULL;
+
+ SELECT s.reportFk, w.labelerFk INTO vReport, vPrinterFk
+ FROM worker w
+ JOIN sector s ON s.id = w.sectorFk
+ JOIN report r ON r.id = s.reportFk
+ WHERE w.id = account.myUser_getId()
+ AND r.name = 'LabelPalletExpedition';
+
+ IF vReport IS NULL THEN
+ CALL util.throw('Sector incorrecto');
+ END IF;
+
UPDATE vn.expeditionPallet
SET isPrint = FALSE
WHERE id = vSelf;
- SELECT s.reportFk, w.labelerFk INTO vReport, vPrinterFk
- FROM worker w
- LEFT JOIN sector s ON s.id= w.sectorFk
- WHERE w.id = account.myUser_getId();
-
INSERT INTO printQueue (printerFk, priorityFk, reportFk, workerFk)
SELECT vPrinterFk, qp.id, vReport, account.myUser_getId()
FROM queuePriority qp
- WHERE qp.`code`= 'high';
-
+ WHERE qp.`code`= 'high';
+
INSERT INTO printQueueArgs (printQueueFk, `name`, `value` )
- SELECT LAST_INSERT_ID(), 'palletFk', vSelf;
+ SELECT LAST_INSERT_ID(), 'palletFk', vSelf;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53779,7 +53814,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_Add`(vHour VARCHAR(
BEGIN
INSERT INTO vn.expeditionTruck(ETD,description)
- VALUES(CONCAT(util.VN_CURDATE(), ' ', vHour), vDescription);
+ VALUES(CONCAT(CURDATE(), ' ', vHour), vDescription);
END ;;
DELIMITER ;
@@ -53804,7 +53839,7 @@ BEGIN
ETD,
description Destino
FROM vn.expeditionTruck
- WHERE ETD BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE ETD BETWEEN CURDATE() AND util.dayend(CURDATE())
ORDER BY ETD;
END ;;
DELIMITER ;
@@ -53839,10 +53874,11 @@ BEGIN
a.nickname,
sub2.itemPackingTypeConcat,
est.code
- FROM expedition e
+ FROM expedition e
JOIN ticket t ON t.id = e.ticketFk
JOIN ticketState ts ON ts.ticketFk = e.ticketFk
JOIN address a ON t.addressFk = a.id
+ JOIN route r ON r.id = t.routeFk
LEFT JOIN warehouse w ON t.warehouseFk = w.id
LEFT JOIN (SELECT sub.ticketFk,
CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeConcat
@@ -53855,7 +53891,8 @@ BEGIN
GROUP BY sub.ticketFk
) sub2 ON sub2.ticketFk = t.id
LEFT JOIN expeditionStateType est ON est.id = e.stateTypeFk
- WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE;
+ WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE
+ ORDER BY r.created, t.priority DESC;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -54064,7 +54101,7 @@ BEGIN
JOIN vn.client c ON c.id = t.clientFk
WHERE c.typeFk = 'loses' COLLATE utf8_unicode_ci
AND s.isPicked = FALSE
- AND date(t.shipped) = util.VN_CURDATE()
+ AND date(t.shipped) = CURDATE()
AND t.warehouseFk = vWarehouseFk
) sub ON sub.itemFk = ishr.itemFk
;
@@ -54094,7 +54131,7 @@ BEGIN
JOIN vn.client c ON c.id = t.clientFk
SET s.isPicked = TRUE
WHERE c.typeFk = 'loses' COLLATE utf8_unicode_ci
- AND date(t.shipped) = util.VN_CURDATE()
+ AND date(t.shipped) = CURDATE()
AND t.warehouseFk = vWarehouseFk
AND s.itemFk = vItemFk;
@@ -54406,7 +54443,7 @@ BEGIN
t.routeFk as routeFk
FROM vn2008.expeditions e
INNER JOIN vn.ticket t ON t.id = e.ticket_id
- WHERE DATE(odbc_date) = util.VN_CURDATE();
+ WHERE DATE(odbc_date) = CURDATE();
END ;;
DELIMITER ;
@@ -54486,6 +54523,41 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `greuge_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `greuge_add`()
+BEGIN
+/**
+ * Group inserts into vn.greuge and then deletes the records just inserted
+ */
+ DECLARE vDated DATE;
+
+ SELECT DATE_SUB(CURDATE(), INTERVAL yearsToDelete YEAR) INTO vDated
+ FROM vn.greugeConfig;
+
+ INSERT INTO vn.greuge(clientFk, description, amount, shipped, created, greugeTypeFk)
+ SELECT clientFk, 'Suma agrupada', SUM(amount), MAX(shipped), MAX(created), greugeTypeFk
+ FROM vn.greuge
+ WHERE shipped <= vDated AND description <> 'Suma agrupada'
+ GROUP BY clientFk, greugeTypeFk;
+
+ DELETE
+ FROM vn.greuge
+ WHERE shipped <= vDated AND description <> 'Suma agrupada';
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `intrastat_data_neto_Update` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -54650,7 +54722,7 @@ proc: BEGIN
WHERE warehouseOutFk = 13
AND warehouseInFk = vWh
AND landed = vDate
- AND agencyFk = 53
+ AND agencyModeFk = 53
AND ref = 'inventario'
LIMIT 1;
@@ -54661,7 +54733,7 @@ proc: BEGIN
warehouseInFk = vWh,
shipped = vDate,
landed = vDate,
- agencyFk = 53,
+ agencyModeFk = 53,
ref = 'inventario',
isDelivered = TRUE,
isReceived = TRUE;
@@ -54813,12 +54885,12 @@ proc: BEGIN
vEntryFk
FROM tmp.inventory;
- SELECT vWh, count(*), util.VN_NOW() FROM tmp.inventory;
+ SELECT vWh, count(*), NOW() FROM tmp.inventory;
-- Actualizamos el campo lastUsed de vn.item
UPDATE vn.item i
JOIN tmp.inventory i2 ON i2.itemFk = i.id
- SET i.lastUsed = util.VN_NOW()
+ SET i.lastUsed = NOW()
WHERE i2.quantity;
-- DROP TEMPORARY TABLE tmp.inventory;
@@ -54838,8 +54910,8 @@ proc: BEGIN
FROM vn.travel t
JOIN vn.entry e ON e.travelFk = t.id
WHERE e.supplierFk = 4
- AND t.shipped <= TIMESTAMPADD(DAY, -2, TIMESTAMPADD(DAY, -10, util.VN_CURDATE()))
- AND (DAY(t.shipped) <> 1 OR shipped < TIMESTAMPADD(MONTH, -12, util.VN_CURDATE()));
+ AND t.shipped <= TIMESTAMPADD(DAY, -2, TIMESTAMPADD(DAY, -10, CURDATE()))
+ AND (DAY(t.shipped) <> 1 OR shipped < TIMESTAMPADD(MONTH, -12, CURDATE()));
DELETE e
FROM vn.entry e
@@ -54870,7 +54942,7 @@ BEGIN
* Recalcula los inventarios de todos los almacenes.
*/
- call vn.inventoryMake(TIMESTAMPADD(DAY, -10, util.VN_CURDATE()), 0);
+ call vn.inventoryMake(TIMESTAMPADD(DAY, -10, CURDATE()), 0);
END ;;
DELIMITER ;
@@ -54926,7 +54998,7 @@ BEGIN
LEFT JOIN origin o ON o.id = i.originFk
) ON it.id = i.typeFk
LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
- WHERE (b.packageFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
+ WHERE (b.packageFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,CURDATE())) AND s.name = 'INVENTARIO';
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
CREATE TEMPORARY TABLE tmp.lastEntryOk
@@ -54963,7 +55035,7 @@ BEGIN
LEFT JOIN origin o ON o.id = i.originFk
) ON it.id = i.typeFk
LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
- WHERE b.packageFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,util.VN_CURDATE()))
+ WHERE b.packageFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,CURDATE()))
ORDER BY tr.landed DESC;
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOkGroup;
@@ -55058,7 +55130,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromAddress`(vMaxTicketDate DATETIME,vAddress INT,vCompany INT)
BEGIN
- DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, util.VN_CURDATE());
+ DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, CURDATE());
SET vMaxTicketDate = vn2008.DAYEND(vMaxTicketDate);
@@ -55089,7 +55161,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromClient`(IN vMaxTicketDate datetime, IN vClientFk INT, IN vCompanyFk INT)
BEGIN
- DECLARE vMinTicketDate DATE DEFAULT TIMESTAMPADD(YEAR, -3, util.VN_CURDATE());
+ DECLARE vMinTicketDate DATE DEFAULT TIMESTAMPADD(YEAR, -3, CURDATE());
SET vMaxTicketDate = util.dayend(vMaxTicketDate);
DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
@@ -55951,7 +56023,7 @@ BEGIN
WHERE iot.invoiceOutFk = vInvoice;
UPDATE invoiceOut
- SET booked = util.VN_CURDATE()
+ SET booked = CURDATE()
WHERE id = vInvoice;
END ;;
DELIMITER ;
@@ -56271,7 +56343,7 @@ BEGIN
DECLARE vNewInvoiceInId INT;
DECLARE vIsInterCompany BOOL;
- SET vInvoiceDate = IFNULL(vInvoiceDate,util.VN_CURDATE());
+ SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
SELECT t.clientFk, t.companyFk
INTO vClient, vCompany
@@ -56500,7 +56572,7 @@ BEGIN
END IF;
CALL invoiceFromClient(vMaxShipped, vClientFk, vCompanyFk);
- CALL invoiceOut_new(vSerial, util.VN_CURDATE(), vTaxArea, vInvoiceId);
+ CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
UPDATE invoiceOut
SET `ref` = vRef
@@ -56539,7 +56611,7 @@ BEGIN
*/
DECLARE vIsRefEditable BOOLEAN;
CALL invoiceFromTicket(vTicketFk);
- CALL invoiceOut_new(vSerial, util.VN_CURDATE(), vTaxArea, vInvoiceId);
+ CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
IF vRef IS NOT NULL THEN
SELECT isRefEditable INTO vIsRefEditable
@@ -56747,14 +56819,14 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
FROM vn2008.item_out
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ WHERE dat BETWEEN CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(curdate()))
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) sale ON sale.item_id = i.id
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
FROM vn2008.item_entry_in
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ WHERE dat BETWEEN CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(curdate()))
AND warehouse_id = vWarehouseFk
AND isVirtualStock = FALSE
GROUP BY item_id
@@ -56762,7 +56834,7 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
FROM vn2008.item_entry_out
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ WHERE dat BETWEEN CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(curdate()))
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) mov ON mov.item_id = i.id
@@ -57649,7 +57721,7 @@ BEGIN
AND IFNULL(sub3.transit,0) < s.quantity
AND s.isPicked = FALSE
AND s.reserved = FALSE
- AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND MIDNIGHT(CURDATE())
AND tst.isPreviousPreparable = TRUE
AND t.warehouseFk = vWarehouseFk
AND iss.sectorFk = vSectorFk
@@ -57716,7 +57788,7 @@ proc:BEGIN
WHERE id = vSectorFk;
CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
- CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE());
DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar;
@@ -57845,15 +57917,15 @@ proc:BEGIN
LEFT JOIN vn.zone z ON z.id = t.zoneFk
LEFT JOIN (SELECT DISTINCT saleFk
FROM vn.saleTracking st
- WHERE st.created > util.VN_CURDATE()
+ WHERE st.created > CURDATE()
AND st.isChecked
) stPrevious ON `stPrevious`.`saleFk` = io.saleFk
WHERE t.warehouseFk = vWarehouseFk
AND s.isPicked = 0
AND NOT io.Reservado
AND stPrevious.saleFk IS NULL
- AND io.dat >= util.VN_CURDATE()
- AND io.dat < util.VN_CURDATE()+1
+ AND io.dat >= CURDATE()
+ AND io.dat < CURDATE()+1
) sub
GROUP BY itemFk, hours, minutes;
@@ -57898,10 +57970,10 @@ BEGIN
DECLARE vWarehouseFk INT DEFAULT 1;
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
- DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
+ DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(CURDATE());
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
- CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE());
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
@@ -57931,7 +58003,7 @@ BEGIN
JOIN tmp.item2 ti ON ti.itemFk = s.itemFk
JOIN vn.ticket t ON t.id = s.ticketFk
LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND vTodayDayEnd
+ WHERE t.shipped BETWEEN CURDATE() AND vTodayDayEnd
AND t.warehouseFk = vWarehouseFk
AND IFNULL(tst.productionOrder,0) < 5
GROUP BY s.itemFK
@@ -57963,10 +58035,10 @@ BEGIN
DECLARE vWarehouseFk INT DEFAULT 1;
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
- DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
+ DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(CURDATE());
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
- CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, CURDATE());
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
@@ -58051,7 +58123,7 @@ BEGIN
LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58078,7 +58150,7 @@ BEGIN
LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58266,7 +58338,7 @@ BEGIN
JOIN ticket t ON t.id = c.ticketFk
WHERE c.id = vClaimFk;
- CALL buyUltimate (vWarehouseFk, util.VN_CURDATE());
+ CALL buyUltimate (vWarehouseFk, CURDATE());
INSERT INTO itemShelving (itemFk, shelvingFk, packing, `grouping`, visible)
SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity AS visible
@@ -58403,7 +58475,7 @@ proc:BEGIN
JOIN ticket t ON t.id = s.ticketFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58428,7 +58500,7 @@ proc:BEGIN
JOIN ticket t ON t.id = s.ticketFk
JOIN client c on c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND ISNULL(st.saleFk)
AND ct.code IN ('normal', 'trust')
GROUP BY s.itemFk
@@ -58489,6 +58561,41 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_getAlternatives` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getAlternatives`(vShelvingFk VARCHAR(10))
+BEGIN
+/**
+ * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula
+ * del carro que se le ha pasado.
+ *
+ * @param vShelvingFk matricula del carro
+ */
+ SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder
+ FROM itemShelving is2
+ JOIN shelving sh ON sh.code = is2.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector s ON s.id = p.sectorFk
+ LEFT JOIN worker w ON w.sectorFk = s.id AND w.id = account.myUser_getId()
+ JOIN warehouse wh ON wh.id = s.warehouseFk
+ JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+ WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci
+ GROUP BY is2.id
+ ORDER BY p.pickingOrder DESC;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_getInfo` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -58575,11 +58682,11 @@ BEGIN
FROM (
SELECT * FROM (
SELECT t2.* FROM (
- SELECT item_id itemFk, amount, util.VN_CURDATE() dated
+ SELECT item_id itemFk, amount, CURDATE() dated
FROM cache.stock
WHERE warehouse_id = vWarehouseFk
UNION ALL
- SELECT ish.itemFk, - sum(visible), util.VN_CURDATE()
+ SELECT ish.itemFk, - sum(visible), CURDATE()
FROM vn.itemShelving ish
JOIN shelving sh ON sh.code = ish.shelvingFk
JOIN parking p ON sh.parkingFk = p.id
@@ -58589,21 +58696,21 @@ BEGIN
UNION ALL
SELECT item_id, sum(iei.amount), dat
FROM vn2008.item_entry_in iei
- WHERE dat >= util.VN_CURDATE()
+ WHERE dat >= CURDATE()
AND warehouse_id = vWarehouseFk
AND isVirtualStock = FALSE
GROUP BY item_id, dat
UNION ALL
SELECT item_id, sum(ieo.amount), dat
FROM vn2008.item_entry_out ieo
- WHERE dat >= util.VN_CURDATE()
+ WHERE dat >= CURDATE()
AND warehouse_id = vWarehouseFk
GROUP BY item_id, dat
UNION ALL
SELECT i.itemFk, sum(io.amount), dat
FROM vn2008.item_out io
JOIN tmp.item i ON i.itemFk = io.item_id
- WHERE io.dat >= util.VN_CURDATE()
+ WHERE io.dat >= CURDATE()
AND io.warehouse_id = vWarehouseFk
GROUP BY io.item_id, io.dat
) t2
@@ -58686,41 +58793,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_return` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_return`(vShelving VARCHAR(10))
-BEGIN
-/**
- * Devuelve un listado de posibles ubicaciones a ubicar los item de la matricula
- * del carro que se le ha pasado.
- *
- * @param vShelving matricula del carro
- */
- SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , i.longName , is2.visible
- FROM vn.itemShelving is2
- JOIN vn.item i ON i.id = is2.itemFk
- JOIN vn.shelving sh ON sh.code = is2.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector s ON s.id = p.sectorFk
- LEFT JOIN vn.worker w ON w.sectorFk = s.id AND w.id = account.myUser_getId()
- JOIN vn.warehouse wh ON wh.id = s.warehouseFk
- JOIN vn.itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelving COLLATE utf8_unicode_ci
- GROUP BY is2.id
- ORDER BY p.pickingOrder DESC;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_StarsUpdate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -58807,21 +58879,21 @@ BEGIN
SELECT itemFk, SUM(quantity) stock, SUM(quantity) visible, SUM(quantity) available FROM (
SELECT itemFk, quantity
FROM itemTicketOut
- WHERE shipped >= util.VN_CURDATE() AND shipped < vDated
+ WHERE shipped >= CURDATE() AND shipped < vDated
AND warehouseFk = vWarehouseFk
AND (vItemFk IS NULL OR itemFk = vItemFk)
UNION ALL
SELECT itemFk, quantity
FROM itemEntryIn i
LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk
- WHERE i.landed >= util.VN_CURDATE() AND i.landed < vDated
+ WHERE i.landed >= CURDATE() AND i.landed < vDated
AND i.warehouseInFk = vWarehouseFk
AND (vItemFk IS NULL OR i.itemFk = vItemFk)
AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
UNION ALL
SELECT itemFk, quantity
FROM itemEntryOut
- WHERE shipped >= util.VN_CURDATE() AND shipped < vDated
+ WHERE shipped >= CURDATE() AND shipped < vDated
AND warehouseOutFk = vWarehouseFk
AND (vItemFk IS NULL OR itemFk = vItemFk)
) t
@@ -59069,7 +59141,7 @@ BEGIN
SELECT s.itemFk, SUM(s.quantity) AS total, v.tipo_id typeFk
FROM vn.sale s
INNER JOIN bs.ventas v ON v.Id_Movimiento = s.id
- WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, util.VN_CURDATE()) AND util.VN_CURDATE()
+ WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, CURDATE()) AND CURDATE()
GROUP BY s.itemFk;
DROP TABLE IF EXISTS tmp.topSeller;
@@ -59147,7 +59219,7 @@ BEGIN
JOIN address a ON a.id=t.addressFk
WHERE t.warehouseFk = vWarehouseFk
AND t.clientFk = vClientFk
- AND DATE(t.shipped) = util.VN_CURDATE()
+ AND DATE(t.shipped) = CURDATE()
AND a.isDefaultAddress
LIMIT 1;
@@ -59157,13 +59229,13 @@ BEGIN
CALL ticket_add(
vClientFk,
- util.VN_CURDATE(),
+ CURDATE(),
vWarehouseFk,
vCompanyVnlFk,
NULL,
NULL,
NULL,
- util.VN_CURDATE(),
+ CURDATE(),
account.myUser_getId(),
FALSE,
vTicketFk);
@@ -59172,7 +59244,7 @@ BEGIN
INSERT INTO sale(ticketFk, itemFk, concept, quantity)
SELECT vTicketFk,
vItemFk,
- CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+ CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(NOW() AS TIME),5)),
vQuantity
FROM item
WHERE id = vItemFk;
@@ -59455,7 +59527,7 @@ BEGIN
WHERE isFloramondo
AND (ISNULL(i.supplyResponseFk)
OR sub.NumberOfUnits = 0
- OR sub.lodt < util.VN_NOW())
+ OR sub.lodt < NOW())
GROUP BY i.name,
subname,
value5,
@@ -59529,16 +59601,15 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_deactivateUnused`()
BEGIN
/**
- * Cambia a false el campo isActive de la tabla vn.item
- * para todos aquellos items que no se han comprado
- * en los últimos meses configurados en
- * vn.itemConfig.monthToDeactivate
+ * Cambia a false el campo isActive de la tabla vn.item para todos aquellos
+ * items que no se han comprado en los últimos meses configurados en
+ * @vn.itemConfig.monthToDeactivate
*/
DECLARE vMonthToDeactivate INT;
-
+
SELECT monthToDeactivate INTO vMonthToDeactivate
FROM vn.itemConfig;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.buyMaxCreated;
CREATE TEMPORARY TABLE tmp.buyMaxCreated
ENGINE = MEMORY
@@ -59548,12 +59619,12 @@ BEGIN
JOIN vn.item i ON i.id = b.itemFk
WHERE i.isActive
GROUP BY itemFk;
-
+
UPDATE vn.item i
JOIN tmp.buyMaxCreated bmc ON bmc.itemFk = i.id
SET i.isActive = FALSE
- WHERE bmc.created < util.VN_CURDATE() - INTERVAL vMonthToDeactivate MONTH;
-
+ WHERE bmc.created < CURDATE() - INTERVAL vMonthToDeactivate MONTH;
+
DROP TEMPORARY TABLE IF EXISTS tmp.buyMaxCreated;
END ;;
DELIMITER ;
@@ -59574,7 +59645,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
BEGIN
DECLARE vDateInventory DATETIME;
- DECLARE vCurdate DATE DEFAULT util.VN_CURDATE();
+ DECLARE vCurdate DATE DEFAULT CURDATE();
DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
SELECT inventoried INTO vDateInventory FROM config;
@@ -59592,8 +59663,8 @@ BEGIN
`in` AS invalue,
`out`,
@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
- @currentLineFk := IF (@shipped < util.VN_CURDATE()
- OR (@shipped = util.VN_CURDATE() AND (isPicked OR alertLevel >= 2)),
+ @currentLineFk := IF (@shipped < CURDATE()
+ OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)),
lineFk,@currentLineFk) lastPreparedLineFk,
isTicket,
lineFk,
@@ -59622,8 +59693,8 @@ BEGIN
JOIN supplier s ON s.id = e.supplierFk
JOIN alertLevel al ON al.id =
CASE
- WHEN tr.landed < util.VN_CURDATE() THEN 3
- WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
+ WHEN tr.landed < CURDATE() THEN 3
+ WHEN tr.landed = CURDATE() AND tr.isReceived = TRUE THEN 3
ELSE 0
END
JOIN state st ON st.code = al.code
@@ -59656,8 +59727,8 @@ BEGIN
JOIN supplier s ON s.id = e.supplierFk
JOIN alertLevel al ON al.id =
CASE
- WHEN tr.shipped < util.VN_CURDATE() THEN 3
- WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
+ WHEN tr.shipped < CURDATE() THEN 3
+ WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
ELSE 0
END
JOIN state st ON st.code = al.code
@@ -59693,8 +59764,8 @@ BEGIN
JOIN clientType ct ON ct.id = c.clientTypeFk
JOIN alertLevel al ON al.id =
CASE
- WHEN t.shipped < util.VN_CURDATE() THEN 3
- WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0
+ WHEN t.shipped < curdate() THEN 3
+ WHEN t.shipped > util.dayEnd(curdate()) THEN 0
ELSE IFNULL(ts.alertLevel, 0)
END
LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
@@ -59725,70 +59796,71 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getInfo`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT)
BEGIN
- /*
- * Devuelve información relativa al item correspondiente del vBarcode pasado
- *
- * @param vBarcode código relativo al ítem
- * @param vWarehouseFk código del almacén
- */
-
+/**
+ * Devuelve información relativa al item correspondiente del vBarcode pasado
+ *
+ * @param vBarcode código relativo al ítem
+ * @param vWarehouseFk código del almacén
+ */
DECLARE vCacheVisibleFk INT;
DECLARE vCacheAvailableFk INT;
DECLARE vVisibleItemShelving INT;
DECLARE vItemFk INT;
-
- SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
- CALL cache.visible_refresh(vCacheVisibleFk, FALSE,vWarehouseFk);
- CALL cache.available_refresh(vCacheAvailableFk, FALSE,vWarehouseFk, util.VN_CURDATE());
-
+
+ CALL cache.visible_refresh(vCacheVisibleFk, FALSE, vWarehouseFk);
+ CALL cache.available_refresh(vCacheAvailableFk, FALSE, vWarehouseFk, CURDATE());
+ CALL buyUltimate(vWarehouseFk, CURDATE());
+
+ SELECT barcodeToItem(vBarcode) INTO vItemFk;
SELECT SUM(visible) INTO vVisibleItemShelving
- FROM vn.itemShelvingStock
- WHERE itemFk = vItemFk AND warehouseFk = vWarehouseFk;
-
- CALL vn.buyUltimate(vWarehouseFk, util.VN_CURDATE());
-
- SELECT i.id,
- i.longName,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7,
- i.image,
- i.size,
- i.stems,
- i.category,
- i.minimum as min,
- p.name as producer,
- o.code as origin,
- v.visible - IFNULL(vVisibleItemShelving,0) as unlocated,
- a.available,
- vVisibleItemShelving,
- v.visible,
- c.`grouping`,
- c.packing,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) as urlImage200,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) as urlImage,
- i.itemPackingTypeFk,
- i.comment reference,
- u.name buyer
- FROM vn.item i
- LEFT JOIN vn.producer p ON p.id = i.producerFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id
- LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id
- LEFT JOIN (
- SELECT b.itemFk, b2.`grouping`, b2.packing
- FROM tmp.buyUltimate b
- JOIN vn.buy b2 ON b2.id = b.buyFk
- WHERE b.warehouseFk = vWarehouseFk
- ) c ON i.id = c.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN account.user u ON u.id = it.workerFk
- WHERE i.id = vItemFk;
- DROP TEMPORARY TABLE tmp.buyUltimate;
+ FROM itemShelvingStock
+ WHERE itemFk = vItemFk
+ AND warehouseFk = vWarehouseFk;
+
+ SELECT i.id,
+ i.longName,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7,
+ i.image,
+ i.`size`,
+ i.stems,
+ i.category,
+ i.minimum `min`,
+ p.name producer,
+ o.code origin,
+ v.visible - IFNULL(vVisibleItemShelving, 0) unlocated,
+ a.available,
+ vVisibleItemShelving,
+ v.visible,
+ b.`grouping`,
+ b.packing,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) urlImage200,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) urlImage,
+ i.itemPackingTypeFk,
+ i.comment reference,
+ u.name buyer,
+ IFNULL(b.buyingValue, 0) +
+ IFNULL(b.freightValue, 0) +
+ IFNULL(b.comissionValue, 0) +
+ IFNULL(b.packageValue, 0) itemCost
+ FROM item i
+ LEFT JOIN producer p ON p.id = i.producerFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk
+ AND v.item_id = i.id
+ LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk
+ AND a.item_id = i.id
+ LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+ LEFT JOIN buy b ON b.id = bu.buyFk
+ AND bu.warehouseFk = vWarehouseFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN account.user u ON u.id = it.workerFk
+ WHERE i.id = vItemFk;
+ DROP TEMPORARY TABLE tmp.buyUltimate;
END ;;
DELIMITER ;
@@ -59816,7 +59888,7 @@ BEGIN
**/
CALL `cache`.stock_refresh(vForce);
- CALL item_getMinacum(NULL, util.VN_CURDATE(), vDays, NULL);
+ CALL item_getMinacum(NULL, CURDATE(), vDays, NULL);
CALL item_getMinETD();
SELECT i.id itemFk,
@@ -59977,7 +60049,7 @@ BEGIN
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
LEFT JOIN `zone` z ON z.id = t.zoneFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND vMidnight
+ WHERE t.shipped BETWEEN CURDATE() AND vMidnight
GROUP BY s.itemFk;
END ;;
DELIMITER ;
@@ -60094,7 +60166,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_GetVisible`(vWarehouse SMALLINT, vItem INT)
BEGIN
- DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, util.VN_CURDATE());
+ DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, CURDATE());
INSERT INTO vn2008.tmp_item (item_id, visible)
SELECT item_id, SUM(amount) amount
@@ -60106,18 +60178,18 @@ BEGIN
LEFT JOIN (SELECT DISTINCT saleFk
FROM saleTracking st
JOIN state s ON s.id = st.stateFk
- WHERE st.created > util.VN_CURDATE()
+ WHERE st.created > CURDATE()
AND (s.isPicked OR st.isChecked)
) stPrevious ON `stPrevious`.`saleFk` = i.saleFk
WHERE i.warehouseFk = vWarehouse
AND (vItem IS NULL OR i.itemFk = vItem)
AND (s.isPicked OR i.reserved OR stPrevious.saleFk )
- AND i.shipped >= util.VN_CURDATE() AND i.shipped < vTomorrow
+ AND i.shipped >= CURDATE() AND i.shipped < vTomorrow
UNION ALL
SELECT iei.itemFk, quantity
FROM itemEntryIn iei
- WHERE (iei.isReceived != FALSE /*OR ip.modificationDate > util.VN_CURDATE()*/)
- AND iei.landed >= util.VN_CURDATE() AND iei.landed < vTomorrow
+ WHERE (iei.isReceived != FALSE /*OR ip.modificationDate > CURDATE()*/)
+ AND iei.landed >= CURDATE() AND iei.landed < vTomorrow
AND iei.warehouseInFk = vWarehouse
AND (vItem IS NULL OR iei.itemFk = vItem)
AND iei.isVirtualStock is FALSE
@@ -60125,7 +60197,7 @@ BEGIN
SELECT itemFk, quantity
FROM itemEntryOut
WHERE isDelivered != FALSE
- AND shipped >= util.VN_CURDATE() AND shipped < vTomorrow
+ AND shipped >= CURDATE() AND shipped < vTomorrow
AND warehouseOutFk = vWarehouse
AND (vItem IS NULL OR itemFk = vItem)
) t
@@ -60183,13 +60255,13 @@ BEGIN
LEFT JOIN itemTag it1 ON it1.priority = 1 AND it1.itemFk = i.id
LEFT JOIN tagAbbreviation ta1 ON ta1.`value` = it1.`value`
LEFT JOIN itemTag it2 ON it2.priority = 2 AND it2.itemFk = i.id
- LEFT JOIN tagAbbreviation ta2 ON ta2.`value` = it2.`value` AND ta2.`value` != 'Rosa'
+ LEFT JOIN tagAbbreviation ta2 ON ta2.`value` = it2.`value` AND ta2.tagFk IS NULL
LEFT JOIN itemTag it3 ON it3.priority = 3 AND it3.itemFk = i.id
LEFT JOIN tagAbbreviation ta3 ON ta3.`value` = it3.`value`
SET i.`name` = CONCAT_WS(' ',
IFNULL(ta1.abbreviation,it1.`value`),
IFNULL(ta2.abbreviation,it2.`value`),
- IF(i.id > 400000,'',IFNULL(ta3.abbreviation,it3.`value`)))
+ IF(i.isFloramondo,'',IFNULL(ta3.abbreviation,it3.`value`)))
WHERE i.id = vItemFk;
UPDATE item i
@@ -60664,7 +60736,7 @@ BEGIN
JOIN itemType t ON t.id = i.typeFk
JOIN warehouse w ON w.id = tr.warehouseInFk
WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
- AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, trUE)
+ AND IF(tr.landed = CURDATE(), tr.isReceived, trUE)
AND NOT e.isRaid
AND w.valuatedInventory
AND t.isInventory
@@ -60697,7 +60769,7 @@ BEGIN
AND it.isInventory
ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,1,-1);
- IF vDated = util.VN_CURDATE() THEN -- volver a poner lo que esta aun en las estanterias
+ IF vDated = CURDATE() THEN -- volver a poner lo que esta aun en las estanterias
INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
SELECT w.id, s.itemFk, s.quantity * IF(vHasNotInventory,0,1), w.`name`
@@ -61085,7 +61157,7 @@ BEGIN
*/
UPDATE vn.machineWorker mw
JOIN vn.machine m ON m.id = mw.machineFk
- SET mw.outTimed = util.VN_NOW()
+ SET mw.outTimed = NOW()
WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate)
AND ISNULL(mw.outTimed);
@@ -61167,12 +61239,12 @@ BEGIN
IF (SELECT COUNT(*)
FROM machineWorker m
WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, NOW()) AND ISNULL(m.outTimed)) THEN
UPDATE machineWorker m
SET m.outTimed = CURRENT_TIMESTAMP()
WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW())
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, NOW())
AND ISNULL(m.outTimed)
AND m.machineFk = vMachineFk;
@@ -61207,7 +61279,7 @@ BEGIN
SELECT m.plate
FROM machine m
JOIN machineWorker mw ON mw.machineFk = m.id
- WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,util.VN_NOW())
+ WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,NOW())
AND ISNULL(mw.outTimed)
AND mw.workerFk = vWorkerFk;
@@ -61246,7 +61318,7 @@ BEGIN
SELECT COUNT(*) INTO vIsRepeated
FROM vn.mail
- WHERE creationDate >= util.VN_CURDATE()
+ WHERE creationDate >= CURDATE()
AND `receiver` = vReceiver
AND `replyTo` = vReplyTo
AND `subject` = vSubject
@@ -61368,7 +61440,7 @@ BEGIN
*/
DECLARE vWorkerIsExcluded BOOLEAN;
DECLARE vFromDated DATE;
- DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,util.VN_CURDATE());
+ DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
DECLARE vMana INT;
DECLARE vAutoMana INT;
DECLARE vClaimMana INT;
@@ -61420,7 +61492,7 @@ BEGIN
FROM greuge g
JOIN client c ON c.id = g.clientFk
WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
- AND g.shipped > vFromDated and g.shipped < util.VN_CURDATE()
+ AND g.shipped > vFromDated and g.shipped < CURDATE()
UNION ALL
SELECT cc.mana
FROM clientManaCache cc
@@ -62018,6 +62090,52 @@ BEGIN
VALUES(saleFk,valueFk,account.myUser_getId(),encajando);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `packingSite_startCollection` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packingSite_startCollection`(vSelf INT, vTicketFk INT)
+BEGIN
+/**
+ * @param vSelf packingSite id
+ * @param vTicketFk A ticket id from the collection to start
+ */
+ DECLARE vNewCollectionFk INT;
+ DECLARE vOldCollectionFk INT;
+ DECLARE vIsPackingByOther BOOL;
+
+ SELECT collectionFk INTO vNewCollectionFk
+ FROM ticketCollection WHERE ticketFk = vTicketFk;
+
+ SELECT collectionFk INTO vOldCollectionFk
+ FROM packingSite WHERE id = vSelf;
+
+ IF NOT (vOldCollectionFk <=> vNewCollectionFk) THEN
+ SELECT COUNT(*) > 0
+ INTO vIsPackingByOther
+ FROM packingSite
+ WHERE id <> vSelf
+ AND collectionFk = vOldCollectionFk;
+
+ IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) AND vSelf IS NOT NULL THEN
+ CALL util.throw('cannotChangeCollection');
+ END IF;
+ END IF;
+
+ UPDATE packingSite SET collectionFk = vNewCollectionFk
+ WHERE id = vSelf;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62253,7 +62371,7 @@ BEGIN
DECLARE vCalcFk INT;
DECLARE vWarehouseFk INT;
DECLARE vWarehouseAliasFk INT;
- DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
+ DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
DROP TEMPORARY TABLE IF EXISTS tmp.sale;
CREATE TEMPORARY TABLE tmp.sale
@@ -62336,7 +62454,7 @@ BEGIN
ish.visible,
IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,util.VN_NOW()))) as priority,
+ IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
0 as saleOrder,
sc.isPreviousPrepared,
iss.id as itemShelvingSaleFk,
@@ -62457,11 +62575,11 @@ BEGIN
JOIN vn.client c ON c.id = t.clientFk
WHERE c.typeFk IN ('normal','handMaking','internalUse')
AND (
- t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate
+ t.shipped BETWEEN CURDATE() AND vEndingDate
OR (
ts.alertLevel < 3
AND t.shipped >= vStartingDate
- AND t.shipped < util.VN_CURDATE()
+ AND t.shipped < CURDATE()
)
);
END ;;
@@ -62560,7 +62678,7 @@ proc: BEGIN
* @return Table tmp.productionBuffer
*/
- DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(util.VN_CURDATE()));
+ DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
DECLARE vIsTodayRelative BOOLEAN;
@@ -62568,7 +62686,7 @@ proc: BEGIN
FROM vn.worker
WHERE userFk = vn.getUser();
- CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,util.VN_CURDATE()), vEndingDate);
+ CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
CREATE TEMPORARY TABLE tmp.ticket
@@ -62665,7 +62783,7 @@ proc: BEGIN
IF(tp.hasTicketRequest, ' COD 100',''),
IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
IF(tp.hasComponentLack,' COMPONENTES', ''),
- IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle,' PEQUEÑO', '')
+ IF(HOUR(NOW()) < pb.HH AND tp.isTooLittle,' PEQUEÑO', '')
) as char(255)));
-- Clientes Nuevos o Recuperados
@@ -62809,7 +62927,7 @@ BEGIN
FROM vn.sale s
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, 23, CURDATE())
GROUP BY s.ticketFk
HAVING saleNum = iptNull;
@@ -62821,7 +62939,7 @@ BEGIN
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.ticket t ON t.id = s.ticketFk
JOIN vn.sector sc ON sc.id = vSectorFk
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
+ WHERE t.shipped BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, 23, CURDATE())
GROUP BY s.ticketFk
HAVING iptSector;
@@ -63361,13 +63479,13 @@ BEGIN
)
SELECT
vCustomer,
- util.VN_CURDATE(),
+ CURDATE(),
vAddress,
vRefundAgencyMode,
a.nickname,
vWarehouse,
vCompany,
- util.VN_CURDATE(),
+ CURDATE(),
vZoneFk
FROM address a
WHERE a.id = vAddress;
@@ -63467,7 +63585,7 @@ BEGIN
CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color,
CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) levelV,
tc.ticketFk,
- LEFT(IF(t.routeFk IS NULL, am.name, zo.name ), 12) agencyDescription,
+ LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription,
am.name,
t.clientFk,
CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
@@ -63493,6 +63611,8 @@ BEGIN
JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN ticketTrolley tt ON tt.ticket = t.id
LEFT JOIN `zone` zo ON t.zoneFk = zo.id
+ LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN expeditionTruck et ON et.id = rm.expeditionTruckFk
WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam)
GROUP BY t.id
ORDER BY cc.`code`;
@@ -63565,7 +63685,7 @@ UPDATE ticket mt
SELECT tt.addressFk, ROUND(IFNULL(AVG(t.priority),0),0) AS priority
FROM ticket t
JOIN ticket tt ON tt.addressFk = t.addressFk
- WHERE t.shipped > TIMESTAMPADD(YEAR,-1,util.VN_CURDATE())
+ WHERE t.shipped > TIMESTAMPADD(YEAR,-1,CURDATE())
AND tt.routeFk = vRuta
GROUP BY addressFk
) sub ON sub.addressFk = mt.addressFk
@@ -63784,6 +63904,80 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `route_calcCommission` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_calcCommission`(vSelf INT)
+proc: BEGIN
+/**
+ * Calcula las comisión para una ruta y guarda los valores en la tabla routeCommission
+ *
+ * @param vSelf id de ruta
+ */
+ DECLARE vIsUpdatable BOOL;
+ DECLARE vIsFreelance BOOL;
+
+ SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
+ FROM route r
+ JOIN routeConfig rc
+ WHERE r.id = vSelf;
+
+ IF vIsUpdatable THEN
+ DELETE FROM routeCommission
+ WHERE routeFk = vSelf;
+
+ SELECT wl.workerFk IS NULL INTO vIsFreelance
+ FROM route r
+ LEFT JOIN workerLabour wl ON wl.workerFk = r.workerFk
+ WHERE r.id = vSelf
+ LIMIT 1;
+
+ IF vIsFreelance THEN
+ INSERT INTO routeCommission (routeFk, workCenterFk, freelanceYearlyM3)
+ SELECT vSelf,
+ r.commissionWorkCenterFk,
+ rc.freelanceM3 * IF(IFNULL(r.m3, 0) >= rc.freelanceMinM3, IFNULL(r.m3, 0), 0)
+ FROM route r
+ JOIN vehicle v ON v.id = r.vehicleFk
+ JOIN routeConfig rc
+ WHERE r.id = vSelf
+ AND r.workerFk
+ AND r.commissionWorkCenterFk
+ AND r.m3;
+ ELSE
+ INSERT INTO routeCommission (routeFk, workCenterFk, km, m3, yearlyKm, yearlyM3, cat4m3, cat5m3)
+ SELECT vSelf,
+ r.commissionWorkCenterFk,
+ FORMAT((r.kmEnd - r.kmStart) * IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight), 2),
+ FORMAT(IFNULL(r.m3, 0) * IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4), 2),
+ FORMAT((r.kmEnd - r.kmStart) * rc.kmYearly, 2),
+ FORMAT(IFNULL(r.m3, 0) * rc.m3Yearly, 2),
+ FORMAT(distributionCat4M3 * IFNULL(r.m3, 0), 2),
+ FORMAT(rc.distributionCat5M3 * IFNULL(r.m3, 0), 2)
+ FROM route r
+ JOIN vehicle v ON v.id = r.vehicleFk
+ JOIN routeConfig rc
+ WHERE r.id = vSelf
+ AND r.kmStart
+ AND r.kmEnd
+ AND r.workerFk
+ AND r.commissionWorkCenterFk
+ AND r.m3;
+ END IF;
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `route_doRecalc` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -64201,10 +64395,16 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGroup_setParking`(IN `vSaleGroupFk` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
- UPDATE vn.saleGroup sg
+/**
+ * Aparca una preparación previa en un parking
+ *
+ * @param vSaleGroupFk id de la preparación previa
+ * @param vParkingFk id del parking
+ */
+ UPDATE vn.saleGroup sg
SET sg.parkingFk = vParkingFk
WHERE sg.id = vSaleGroupFk
- AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND sg.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
CALL vn.ticket_setNextState(vn.ticket_get(vSaleGroupFk));
END ;;
@@ -65037,10 +65237,10 @@ BEGIN
DECLARE vComponentCount INT;
DECLARE vCursor CURSOR FOR
- SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), date(tt.shipped))
+ SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, CURDATE(), date(tt.shipped))
FROM tmp.sale_getProblems tt
- WHERE DATE(tt.shipped) BETWEEN util.VN_CURDATE()
- AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), util.VN_CURDATE());
+ WHERE DATE(tt.shipped) BETWEEN CURDATE()
+ AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), CURDATE());
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
@@ -65089,12 +65289,12 @@ BEGIN
FROM tmp.ticket_list tl
JOIN vn.saleVolume sv ON sv.ticketFk = tl.ticketFk
JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = util.VN_CURDATE()
+ JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = CURDATE()
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
- WHERE util.VN_NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),util.VN_CURDATE()))
+ WHERE NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),CURDATE()))
AND dm.code IN('AGENCY','DELIVERY','PICKUP')
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
+ AND t.shipped BETWEEN CURDATE() AND util.midnight()
GROUP BY t.addressFk) sub ON sub.addressFk = t.addressFk
JOIN vn.volumeConfig vc
WHERE sub.litros < vc.minTicketVolume
@@ -65129,7 +65329,7 @@ BEGIN
SELECT DISTINCT clientFk
FROM tmp.ticket_list;
- CALL clientGetDebt(util.VN_CURDATE());
+ CALL clientGetDebt(CURDATE());
INSERT INTO tmp.sale_problems(ticketFk, risk, hasHighRisk)
SELECT DISTINCT tl.ticketFk, r.risk, ((r.risk - cc.riskTolerance) > c.credit + 10)
@@ -65206,7 +65406,7 @@ BEGIN
AND ic.merchandise = TRUE
AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
AND NOT i.generic
- AND util.VN_CURDATE() = vDate
+ AND CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
@@ -65232,7 +65432,7 @@ BEGIN
AND ic.merchandise = TRUE
AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
AND NOT i.generic
- AND util.VN_CURDATE() = vDate
+ AND CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
@@ -65260,7 +65460,7 @@ BEGIN
AND ic.merchandise = TRUE
AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
AND NOT i.generic
- AND util.VN_CURDATE() = vDate
+ AND CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
@@ -65665,7 +65865,7 @@ BEGIN
AND (ISNULL(scsg.sectorCollectionFk)
OR
(NOT st.isChecked AND sl.quantity > 0))
- AND sc.created > util.VN_CURDATE();
+ AND sc.created > CURDATE();
END ;;
DELIMITER ;
@@ -65674,38 +65874,36 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sectorCollection_getSale` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_getSale`(vSelf INT)
BEGIN
-
- /**
- * Devuelve las lineas de venta correspondientes a esa coleccion de sector
- *
- * @param vSelf Identificador de vn.sectorCollection
- */
-
+/**
+ * Devuelve las lineas de venta correspondientes a esa coleccion de sector
+ *
+ * @param vSelf Identificador de vn.sectorCollection
+ */
SELECT s.ticketFk,
s.itemFk,
i.longName,
- IFNULL(i.itemPackingTypeFk,' ') itemPackingTypeFk,
- IFNULL(i.subName ,' ') subName,
+ itemPackingTypeFk,
+ subName,
s.quantity,
w.code workerCode,
sgd.saleFk,
- IFNULL(iss.quantity,0) pickedQuantity,
- c.salesPersonFk
+ iss.quantity pickedQuantity,
+ c.salesPersonFk
FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.item i ON i.id = s.itemFk
JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
- JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
JOIN vn.saleTracking st ON st.saleFk = s.id
JOIN vn.state stt ON stt.id = st.stateFk AND stt.code = 'PREVIOUS_PREPARATION'
JOIN vn.worker w ON w.id = st.workerFk
@@ -65713,7 +65911,6 @@ BEGIN
JOIN vn.client c ON c.id=t.clientFk
LEFT JOIN vn.itemShelvingSaleSum iss ON iss.saleFk = s.id
WHERE scsg.sectorCollectionFk = vSelf;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65749,7 +65946,7 @@ BEGIN
WHERE ISNULL(scsg.id)
AND sc.userFk = vUserFk
AND sc.sectorFk = vSectorFk
- AND sc.created >= util.VN_CURDATE();
+ AND sc.created >= CURDATE();
IF NOT hasEmptyCollections THEN
INSERT INTO vn.sectorCollection(userFk, sectorFk)
@@ -65773,30 +65970,29 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorProductivity_add`()
BEGIN
-
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
- SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
-
+ SELECT DATE_SUB(CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
+
DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
DROP TEMPORARY TABLE IF EXISTS tmp.errorsByChecker;
- DROP TEMPORARY TABLE IF EXISTS tmp.previousErrors;
+ DROP TEMPORARY TABLE IF EXISTS tmp.previousErrors;
CALL timeControl_calculateAll(vDatedFrom, vDatedTo);
-
+
CREATE TEMPORARY TABLE tmp.errorsByChecker
ENGINE = MEMORY
SELECT sc.userFk workerFk, COUNT(DISTINCT s.ticketFk) errorsByChecker
FROM saleMistake sm
- JOIN vn.saleGroupDetail sgd on sgd.saleFk = sm.saleFk
- JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
- JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
+ JOIN vn.saleGroupDetail sgd on sgd.saleFk = sm.saleFk
+ JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
JOIN sale s ON s.id = sm.saleFk
JOIN ticket t on t.id = s.ticketFk
- WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
GROUP BY sc.userFk ;
-
+
CREATE TEMPORARY TABLE tmp.previousErrors -- Errores de previa, derivadores de los revisadores (por reclamación)
ENGINE = MEMORY
SELECT tt.workerFk, COUNT(c.ticketFk) errorsByClaim
@@ -65804,13 +66000,13 @@ BEGIN
JOIN claim c ON cd.claimFk = c.id
JOIN ticket t ON c.ticketFk = t.id
JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
- JOIN ticketTracking tt ON tt.ticketFk = t.id
- JOIN state s ON s.id = tt.stateFk
+ JOIN ticketTracking tt ON tt.ticketFk = t.id
+ JOIN state s ON s.id = tt.stateFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = 'Revisadores' AND s.code = 'OK PREVIOUS'
GROUP BY workerFk;
- DELETE FROM sectorProductivity
- WHERE dated = vDatedFrom
+ DELETE FROM sectorProductivity
+ WHERE dated = vDatedFrom
AND sector IN ('Algemesi Artificial','Algemesi Complementos');
INSERT INTO sectorProductivity(workerFk, firstName, lastName, sector, ticketCount, saleCount, error, volume, hourWorked, dated)
@@ -65822,28 +66018,27 @@ BEGIN
COUNT(sgd.id) saleCount,
IFNULL(ec2.errorsByChecker,0) + IFNULL(pe.errorsByClaim, 0) errors,
wp.volume,
- IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked,
DATE(vDatedFrom) dated
FROM vn.saleGroupDetail sgd
- JOIN vn.saleGroup sg on sg.id = sgd.saleGroupFk
- JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
- JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
- join vn.sector se on se.id = sc.sectorFk
- JOIN vn.worker w ON w.id = sc.userFk
+ JOIN vn.saleGroup sg on sg.id = sgd.saleGroupFk
+ JOIN vn.sectorCollectionSaleGroup scsg on scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollection sc on sc.id = scsg.sectorCollectionFk
+ join vn.sector se on se.id = sc.sectorFk
+ JOIN vn.worker w ON w.id = sc.userFk
LEFT JOIN vn.sale s ON s.id = sgd.saleFk
LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = w.id
- LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id
+ LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id
LEFT JOIN vncontrol.accion a ON a.accion_id = wp.actionFk AND a.accion = 'PRESACAR'
LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = w.id
LEFT JOIN tmp.previousErrors pe ON pe.workerFk = w.id
WHERE DATE(sc.created) = vDatedFrom
AND wp.dated = vDatedFrom
GROUP BY w.id;
-
+
DROP TEMPORARY TABLE tmp.timeControlCalculate;
DROP TEMPORARY TABLE tmp.errorsByChecker;
- DROP TEMPORARY TABLE tmp.previousErrors;
-
+ DROP TEMPORARY TABLE tmp.previousErrors;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65911,36 +66106,33 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `setParking`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
proc: BEGIN
-
-/*
+/**
* Aparca una colección, un ticket, un saleGroup o un shelving en un parking
- *
+ *
* @param vParam id del ticket, colección, saleGroup o shelving
- * @param vParkingCode código del parking
- *
+ * @param vParkingCode código del parking
*/
-
DECLARE vParkingFk INT;
DECLARE vIsSaleGroup BOOL;
DECLARE vIsTicket BOOL;
DECLARE vIsCollection BOOL;
-
+
SET vParkingCode = replace(vParkingCode,' ','');
SELECT id INTO vParkingFk
FROM vn.parking
WHERE code = vParkingCode COLLATE utf8_unicode_ci;
-
+
IF vParkingFk IS NULL THEN
CALL util.throw('parkingNotExist');
LEAVE proc;
END IF;
-
+
-- Se comprueba si es una preparación previa
SELECT COUNT(*) INTO vIsSaleGroup
- FROM vn.saleGroup sg
+ FROM vn.saleGroup sg
WHERE sg.id = vParam;
-
+
IF vIsSaleGroup THEN
CALL vn.saleGroup_setParking(vParam, vParkingFk);
LEAVE proc;
@@ -65950,7 +66142,7 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsTicket
FROM vn.ticket t
WHERE t.id = vParam
- AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND t.shipped >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsTicket THEN
CALL vn.ticket_setParking(vParam, vParkingFk);
@@ -65961,8 +66153,8 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsCollection
FROM vn.collection c
WHERE c.id = vParam
- AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
+ AND c.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
+
IF vIsCollection THEN
CALL vn.collection_setParking(vParam, vParkingFk);
LEAVE proc;
@@ -66094,7 +66286,7 @@ proc: BEGIN
UPDATE vn.saleGroup sg
SET sg.parkingFk = vParkingFk
WHERE sg.id = vParam
- AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND sg.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
CALL vn.ticket_setNextState(vn.ticket_get(vParam));
@@ -66106,7 +66298,7 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsTicket
FROM vn.ticket t
WHERE t.id = vParam
- AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND t.shipped >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsTicket THEN
@@ -66141,7 +66333,7 @@ proc: BEGIN
SELECT COUNT(*) INTO vIsCollection
FROM vn.collection c
WHERE c.id = vParam
- AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND c.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsCollection THEN
@@ -66162,7 +66354,7 @@ proc: BEGIN
WHERE s.code = vParam COLLATE utf8_unicode_ci;
UPDATE vn.shelving
- SET parkingFk = vParkingFk, parked = util.VN_NOW(), isPrinted = TRUE
+ SET parkingFk = vParkingFk, parked = NOW(), isPrinted = TRUE
WHERE `code` = vParam COLLATE utf8_unicode_ci;
END ;;
@@ -66194,7 +66386,7 @@ SELECT s.itemFk,
JOIN vn.ticket t ON t.id = s.ticketFk
LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk
JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE()))
+ WHERE t.shipped BETWEEN CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), CURDATE()))
AND iss.saleFk IS NULL
AND t.warehouseFk = vWarehouseFk
GROUP BY s.itemFk
@@ -66243,17 +66435,17 @@ BEGIN
DELETE FROM vn.shelving
WHERE length(code) > 3
- AND parked < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND parked < TIMESTAMPADD(WEEK,-1,CURDATE());
DELETE FROM vn.itemShelving
WHERE visible <= 0
- AND created < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE());
+ AND created < TIMESTAMPADD(MONTH,-1,CURDATE());
DELETE ish.*
FROM vn.itemShelving ish
JOIN vn.shelving sh ON sh.code = ish.shelvingFk
WHERE sh.parkingFk IS NULL
- AND ish.created < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+ AND ish.created < TIMESTAMPADD(WEEK,-1,CURDATE());
UPDATE vn.shelving sh
LEFT JOIN vn.itemShelving its ON its.shelvingFk = sh.`code`
@@ -66263,7 +66455,7 @@ BEGIN
AND sh.isRecyclable
AND ( sh.parked IS NULL
OR
- sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+ sh.parked < TIMESTAMPADD(MONTH,-1,CURDATE())
);
END ;;
@@ -66320,14 +66512,14 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
FROM vn2008.item_out
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) sale ON sale.item_id = i.id
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
FROM vn2008.item_entry_in
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
AND warehouse_id = vWarehouseFk
AND isVirtualStock = FALSE
GROUP BY item_id
@@ -66335,7 +66527,7 @@ BEGIN
LEFT JOIN (
SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
FROM vn2008.item_entry_out
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
AND warehouse_id = vWarehouseFk
GROUP BY item_id
) mov ON mov.item_id = i.id
@@ -66358,7 +66550,7 @@ BEGIN
JOIN vn.warehouse w ON w.id = s.warehouseFk
LEFT JOIN tmp.stock s ON s.itemFk = ish.itemFk
WHERE (w.name = 'Algemesi'
- OR (w.name = 'NuncaJamas' AND ish.created < util.VN_CURDATE()))
+ OR (w.name = 'NuncaJamas' AND ish.created < curdate()))
AND ish.visible
GROUP BY ish.shelvingFk
HAVING lineas = spam OR isSpam;
@@ -66383,23 +66575,20 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `shelving_setParking`(IN `vShelvingCode` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
-
-/*
+/**
* Aparca una matrícula en un parking
- *
+ *
* @param vShelvingCode code de la matrícula
- * @param vParkingFk id del parking
- *
+ * @param vParkingFk id del parking
*/
-
-INSERT INTO vn.shelvingLog (originFk, userFk, action , description)
- SELECT vShelvingCode, account.myUser_getId(), 'update', CONCAT("Cambio parking ",vShelvingCode," de ", p.code," a ", vParkingFk)
- FROM parking p
- JOIN shelving s ON s.parkingFk = p.id
- WHERE s.code = vShelvingCode COLLATE utf8_unicode_ci;
+ INSERT INTO vn.shelvingLog (originFk, userFk, action , description)
+ SELECT vShelvingCode, account.myUser_getId(), 'update', CONCAT("Cambio parking ",vShelvingCode," de ", p.code," a ", vParkingFk)
+ FROM parking p
+ JOIN shelving s ON s.parkingFk = p.id
+ WHERE s.code = vShelvingCode COLLATE utf8_unicode_ci;
UPDATE vn.shelving
- SET parkingFk = vParkingFk, parked = util.VN_NOW(), isPrinted = TRUE
+ SET parkingFk = vParkingFk, parked = NOW(), isPrinted = TRUE
WHERE code = vShelvingCode COLLATE utf8_unicode_ci;
END ;;
DELIMITER ;
@@ -66452,7 +66641,7 @@ BEGIN
ORDER BY ci.creationDate DESC
LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente;
- CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
+ CALL vn2008.risk_vs_client_list(CURDATE());
SELECT
c.Id_Cliente, c.Cliente, c.Credito credito_vn, c.creditInsurance solunion, cast(r.risk as DECIMAL(10,0)) riesgo_vivo,
@@ -66603,7 +66792,7 @@ BEGIN
SELECT item_id, SUM(amount) amount
FROM vn2008.item_entry_in
WHERE dat = vDate
- AND vDate >= util.VN_CURDATE()
+ AND vDate >= CURDATE()
AND warehouse_id = vWarehouse
AND isVirtualStock is FALSE
GROUP BY item_id
@@ -67021,7 +67210,7 @@ BEGIN
FROM vn.payment p
LEFT JOIN vn.supplier s ON s.id = p.supplierFk
LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
- WHERE p.created < (util.VN_CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
+ WHERE p.created < (CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
AND pm.graceMonthsDisableChecked
AND s.isPayMethodChecked
GROUP BY p.supplierFk) sdpmc ON sdpmc.supplierFk = s.id
@@ -67321,7 +67510,7 @@ BEGIN
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
+ SET vNewShipped = IFNULL(vNewShipped, CURDATE());
CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
@@ -68018,10 +68207,10 @@ BEGIN
WHERE t.id = vTicket;
IF vAlertLevel IS NULL OR vAlertLevel = 0 THEN
- IF vShipped >= util.VN_CURDATE() THEN
+ IF vShipped >= CURDATE() THEN
CALL cache.available_refresh(vAvailableCalc, FALSE, vWarehouse, vShipped);
END IF;
- IF vShipped = util.VN_CURDATE() THEN
+ IF vShipped = CURDATE() THEN
CALL cache.visible_refresh(vVisibleCalc, FALSE, vWarehouse);
END IF;
END IF;
@@ -68601,45 +68790,57 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_add`(
- vClientId INT
- ,vShipped DATE
- ,vWarehouseFk INT
- ,vCompanyFk INT
- ,vAddressFk INT
- ,vAgencyModeFk INT
- ,vRouteFk INT
- ,vlanded DATE
- ,vUserId INT
- ,vIsRequiredZone INT
- ,OUT vNewTicket INT)
+ vClientId INT
+ ,vShipped DATE
+ ,vWarehouseFk INT
+ ,vCompanyFk INT
+ ,vAddressFk INT
+ ,vAgencyModeFk INT
+ ,vRouteFk INT
+ ,vlanded DATE
+ ,vUserId INT
+ ,vIsRequiredZone INT
+ ,OUT vNewTicket INT)
BEGIN
-
DECLARE vZoneFk INT;
- DECLARE vPrice DECIMAL(10,2);
- DECLARE vBonus DECIMAL(10,2);
-
- IF vClientId IS NULL THEN
- CALL util.throw ('CLIENT_NOT_ESPECIFIED');
+ DECLARE vPrice DECIMAL(10,2);
+ DECLARE vBonus DECIMAL(10,2);
+ DECLARE vIsActive BOOL;
+
+ IF vClientId IS NULL THEN
+ CALL util.throw ('CLIENT_NOT_ESPECIFIED');
+ END IF;
+
+ SELECT isActive INTO vIsActive
+ FROM vn.client
+ WHERE id = vClientId;
+
+ IF NOT vIsActive THEN
+ CALL util.throw ('CLIENT_NOT_ACTIVE');
END IF;
IF NOT vAddressFk OR vAddressFk IS NULL THEN
- SELECT id INTO vAddressFk
- FROM address
- WHERE clientFk = vClientId AND isDefaultAddress;
- END IF;
-
+ SELECT id INTO vAddressFk
+ FROM address
+ WHERE clientFk = vClientId
+ AND isDefaultAddress;
+ END IF;
+
IF vAgencyModeFk IS NOT NULL THEN
-
CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
-
- SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
+
+ SELECT zoneFk, price, bonus
+ INTO vZoneFk, vPrice, vBonus
FROM tmp.zoneGetShipped
- WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
-
+ WHERE shipped = vShipped
+ AND warehouseFk = vWarehouseFk
+ LIMIT 1;
+
IF (vZoneFk IS NULL OR vZoneFk = 0) AND vIsRequiredZone THEN
- CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
+ CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
END IF;
END IF;
+
INSERT INTO ticket (
clientFk,
shipped,
@@ -68650,23 +68851,22 @@ BEGIN
routeFk,
companyFk,
landed,
- zoneFk,
- zonePrice,
- zoneBonus
+ zoneFk,
+ zonePrice,
+ zoneBonus
)
- SELECT
- vClientId,
- vShipped,
- a.id,
- vAgencyModeFk,
- a.nickname,
- vWarehouseFk,
- IF(vRouteFk,vRouteFk,NULL),
- vCompanyFk,
- vlanded,
- vZoneFk,
- vPrice,
- vBonus
+ SELECT vClientId,
+ vShipped,
+ a.id,
+ vAgencyModeFk,
+ a.nickname,
+ vWarehouseFk,
+ IF(vRouteFk,vRouteFk,NULL),
+ vCompanyFk,
+ vlanded,
+ vZoneFk,
+ vPrice,
+ vBonus
FROM address a
JOIN agencyMode am ON am.id = a.agencyModeFk
WHERE a.id = vAddressFk;
@@ -68678,16 +68878,16 @@ BEGIN
FROM addressObservation ao
JOIN address a ON a.id = ao.addressFk
WHERE a.id = vAddressFk;
-
- IF (SELECT COUNT(*) FROM bs.clientNewBorn cnb
- WHERE cnb.clientFk = vClientId
- AND NOT cnb.isRookie) = 0 THEN
-
+
+ IF (SELECT COUNT(*)
+ FROM bs.clientNewBorn cnb
+ WHERE cnb.clientFk = vClientId
+ AND NOT cnb.isRookie) = 0 THEN
+
CALL vn.ticketObservation_addNewBorn(vNewTicket);
-
END IF;
- INSERT INTO vn.ticketLog
+ INSERT INTO vn.ticketLog
SET originFk = vNewTicket, userFk = vUserId, `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket);
IF (SELECT ct.isCreatedAsServed FROM vn.clientType ct JOIN vn.client c ON c.typeFk = ct.code WHERE c.id = vClientId ) <> FALSE THEN
@@ -68750,7 +68950,7 @@ BEGIN
* Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
*
* @param vDated Fecha de los tickets que se quieren adelantar.
- * @param vWarehouseFk AlmacénitemEntryIn
+ * @param vWarehouseFk Almacén
*/
DECLARE vDateInventory DATE;
DECLARE vDateToAdvance DATE;
@@ -68977,16 +69177,16 @@ BEGIN
LEFT JOIN (SELECT tc.collectionFk
FROM ticketCollection tc
WHERE ticketFk = vTicketFk
- AND tc.created >= util.VN_CURDATE()
+ AND tc.created >= CURDATE()
)sub ON sub.collectionFk = tc.collectionFk
WHERE ts.workerFk = vWorkerFk
AND sub.collectionFk IS NULL
- AND tc.created >= util.VN_CURDATE()
+ AND tc.created >= CURDATE()
GROUP BY tc.collectionFk
)sub ON sub.collectionFk = tc.collectionFk
JOIN ticketState ts ON ts.ticketFk = t.id
WHERE ts.code IN ('ON_PREPARATION', 'PREPARED', 'PREVIOUS_PREPARATION', 'OK PREVIOUS')
- AND t.shipped >= util.VN_CURDATE()
+ AND t.shipped >= CURDATE()
AND s.quantity <>0
LIMIT 1;
@@ -69187,7 +69387,7 @@ BEGIN
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
- SET vYear = YEAR(util.VN_CURDATE()) + IF(vWeek < WEEK(util.VN_CURDATE()),1, 0);
+ SET vYear = YEAR(CURDATE()) + IF(vWeek < WEEK(CURDATE()),1, 0);
OPEN rsTicket;
myLoop: LOOP
@@ -69707,7 +69907,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp.ticket
SELECT ticketFk
FROM tmp.productionBuffer
- WHERE shipped = util.VN_CURDATE()
+ WHERE shipped = curdate()
AND problem LIKE '%I:%'
AND (HH <= vHour OR HH = vHour AND mm < vMinute)
AND alertLevel = 0;
@@ -69815,39 +70015,43 @@ proc: BEGIN
/**
* Recalculates modified ticket.
*/
-
DECLARE vDone BOOL;
DECLARE vTicketFk INT;
DECLARE vError INT;
DECLARE cCur CURSOR FOR
- SELECT ticketFk FROM ticketRecalc;
+ SELECT DISTINCT ticketFk FROM tTicket;
DECLARE CONTINUE HANDLER FOR NOT FOUND
SET vDone = TRUE;
-
+
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
- BEGIN
+ BEGIN
DO RELEASE_LOCK('vn.ticket_doRecalc');
ROLLBACK;
GET DIAGNOSTICS CONDITION 2 @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT;
- SET vError = IFNULL(@errno, 0) ;
- IF NOT(vError = 1105 OR vError = 1751) THEN
+ SET vError = IFNULL(@errno, 0);
+ IF NOT(vError = 1105 OR vError = 1751) THEN
CALL `vn`.`mail_insert`('cau@verdnatura.es',
- NULL,
- 'Problema al recalcular el total de ticket',
- CONCAT('Se ha detectado un problema en ticket_doRecalc al calcular el total del ticket : ',
- vTicketFk,' el error es el: ',
- CONCAT('ERROR ', IFNULL(@errno, 0), ': ', ifnull(@text, '')))
- );
+ NULL,
+ 'Problema al recalcular el total de ticket',
+ CONCAT('Se ha detectado un problema en ticket_doRecalc al calcular el total del ticket : ',
+ vTicketFk,' el error es el: ',
+ CONCAT('ERROR ', IFNULL(@errno, 0), ': ', ifnull(@text, '')))
+ );
END IF;
- RESIGNAL;
+ RESIGNAL;
END;
IF !GET_LOCK('vn.ticket_doRecalc', 0) THEN
LEAVE proc;
END IF;
+ DROP TEMPORARY TABLE IF EXISTS tTicket;
+ CREATE TEMPORARY TABLE tTicket
+ ENGINE = MEMORY
+ SELECT id, ticketFk FROM ticketRecalc;
+
OPEN cCur;
myLoop: LOOP
@@ -69858,27 +70062,15 @@ proc: BEGIN
LEAVE myLoop;
END IF;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- ENGINE = MEMORY
- SELECT vTicketFk ticketFk;
-
- CALL ticketGetTotal;
-
- START TRANSACTION;
- UPDATE ticket t
- JOIN tmp.ticketTotal tt ON tt.ticketFk = t.id
- SET t.totalWithVat = tt.total,
- t.totalWithoutVat = tt.totalWithoutVat;
- DELETE FROM ticketRecalc WHERE ticketFk = vTicketFk;
- COMMIT;
-
- DROP TEMPORARY TABLE
- tmp.ticket,
- tmp.ticketTotal;
+ CALL ticket_recalc(vTicketFk);
END LOOP;
CLOSE cCur;
+
+ DELETE tr FROM ticketRecalc tr JOIN tTicket t ON tr.id = t.id;
+
+ DROP TEMPORARY TABLE tTicket;
+
DO RELEASE_LOCK('vn.ticket_doRecalc');
END ;;
DELIMITER ;
@@ -69887,58 +70079,73 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_doRefund` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doRefund`(OUT vNewTicket INT)
BEGIN
-
+/**
+ * Crea un ticket de abono a partir de tmp.sale y/o tmp.ticketService
+ *
+ * @return vNewTicket
+ */
DECLARE vDone BIT DEFAULT 0;
- DECLARE vCustomer MEDIUMINT;
+ DECLARE vClientFk MEDIUMINT;
DECLARE vWarehouse TINYINT;
DECLARE vCompany MEDIUMINT;
DECLARE vAddress MEDIUMINT;
- DECLARE vRefundAgencyMode INT;
- DECLARE vItemFk INT;
- DECLARE vQuantity DECIMAL (10,2);
- DECLARE vConcept VARCHAR(50);
- DECLARE vPrice DECIMAL (10,2);
- DECLARE vDiscount TINYINT;
+ DECLARE vRefundAgencyMode INT;
+ DECLARE vItemFk INT;
+ DECLARE vQuantity DECIMAL (10,2);
+ DECLARE vConcept VARCHAR(50);
+ DECLARE vPrice DECIMAL (10,2);
+ DECLARE vDiscount TINYINT;
DECLARE vSaleNew INT;
- DECLARE vSaleMain INT;
- DECLARE vZoneFk INT;
- DECLARE vDescription VARCHAR(50);
- DECLARE vTaxClassFk INT;
- DECLARE vTicketServiceTypeFk INT;
-
- DECLARE cSales CURSOR FOR
- SELECT *
- FROM tmp.sale;
-
+ DECLARE vSaleMain INT;
+ DECLARE vZoneFk INT;
+ DECLARE vDescription VARCHAR(50);
+ DECLARE vTaxClassFk INT;
+ DECLARE vTicketServiceTypeFk INT;
+ DECLARE vOriginTicket INT;
+
+ DECLARE cSales CURSOR FOR
+ SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
+ FROM tmp.sale s;
+
DECLARE cTicketServices CURSOR FOR
- SELECT *
- FROM tmp.ticketService;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-
- SELECT id INTO vRefundAgencyMode
+ SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
+ FROM tmp.ticketService ts;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ SELECT sub.ticketFk INTO vOriginTicket
+ FROM (
+ SELECT s.ticketFk
+ FROM tmp.sale s
+ UNION ALL
+ SELECT ts.ticketFk
+ FROM tmp.ticketService ts
+ ) sub
+ LIMIT 1;
+
+ SELECT id INTO vRefundAgencyMode
FROM agencyMode WHERE `name` = 'ABONO';
- SELECT clientFk, warehouseFk, companyFk, addressFk
- INTO vCustomer, vWarehouse, vCompany, vAddress
- FROM ticket
- WHERE id = vOriginTicket;
-
- SELECT id INTO vZoneFk
+ SELECT clientFk, warehouseFk, companyFk, addressFk
+ INTO vClientFk, vWarehouse, vCompany, vAddress
+ FROM ticket
+ WHERE id = vOriginTicket;
+
+ SELECT id INTO vZoneFk
FROM zone WHERE agencyModeFk = vRefundAgencyMode
- LIMIT 1;
-
+ LIMIT 1;
+
INSERT INTO vn.ticket (
clientFk,
shipped,
@@ -69948,61 +70155,57 @@ BEGIN
warehouseFk,
companyFk,
landed,
- zoneFk
+ zoneFk
)
SELECT
- vCustomer,
- util.VN_CURDATE(),
- vAddress,
- vRefundAgencyMode,
- a.nickname,
- vWarehouse,
- vCompany,
- util.VN_CURDATE(),
- vZoneFk
+ vClientFk,
+ CURDATE(),
+ vAddress,
+ vRefundAgencyMode,
+ a.nickname,
+ vWarehouse,
+ vCompany,
+ CURDATE(),
+ vZoneFk
FROM address a
WHERE a.id = vAddress;
SET vNewTicket = LAST_INSERT_ID();
- SET vDone := 0;
+ SET vDone := FALSE;
OPEN cSales;
- FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
+ FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
WHILE NOT vDone DO
-
INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
- SET vSaleNew = LAST_INSERT_ID();
-
- INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
- SELECT vSaleNew,componentFk,`value`
- FROM vn.saleComponent
- WHERE saleFk = vSaleMain;
-
+
+ SET vSaleNew = LAST_INSERT_ID();
+
+ INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
+ SELECT vSaleNew,componentFk,`value`
+ FROM vn.saleComponent
+ WHERE saleFk = vSaleMain;
+
FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
END WHILE;
CLOSE cSales;
- SET vDone := 0;
+ SET vDone := FALSE;
OPEN cTicketServices;
- FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
+ FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
WHILE NOT vDone DO
-
INSERT INTO vn.ticketService(description, quantity, price, taxClassFk, ticketFk, ticketServiceTypeFk)
VALUES(vDescription, vQuantity, vPrice, vTaxClassFk, vNewTicket, vTicketServiceTypeFk);
-
+
FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
END WHILE;
+
CLOSE cTicketServices;
INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
VALUES(vNewTicket, vOriginTicket);
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70010,50 +70213,74 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_getFromFloramondo` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getFromFloramondo`(vDateFrom DATE, vDateTo DATE)
BEGIN
-
/**
- * Genera una tabla con la lista de tickets de Floramondo para una fecha determinada
+ * Genera una tabla con la lista de tickets de Floramondo
+ * para una fecha determinada.
+ *
* @param vDated Fecha de preparación de los pedidos
- * @return tmp.ticketFloramondo(ticketFk, clientName, agencyName, freight, expeditionCount, margin, trolleys, pallets)
+ * @table tmp.ticketFloramondo(ticketFk, clientName, agencyName,
+ * agencyModeFk, supplierName, supplierFk, freight, expeditionCount,
+ * margin, trolleys, pallets, shipped, created)
*/
-
DROP TEMPORARY TABLE IF EXISTS tmp.ticketFloramondo;
CREATE TEMPORARY TABLE tmp.ticketFloramondo
(ticketFk INT PRIMARY KEY,
clientName VARCHAR(50),
agencyName VARCHAR(50),
+ agencyModeFk INT,
+ supplierName VARCHAR(50),
+ supplierFk INT,
freight DECIMAL(10,2) DEFAULT 0,
expeditionCount INT,
margin DECIMAL(10,3) DEFAULT 0,
trolleys INT DEFAULT 0,
+ pallets INT DEFAULT 0,
shipped DATE,
- pallets INT DEFAULT 0)
+ created DATE)
ENGINE = MEMORY;
-
- INSERT INTO tmp.ticketFloramondo(ticketFk, clientName, agencyName, shipped)
- SELECT t.id ticketFk, t.nickname , am.name, t.shipped
+
+ INSERT INTO tmp.ticketFloramondo(ticketFk,
+ clientName,
+ agencyName,
+ agencyModeFk,
+ shipped,
+ supplierName,
+ supplierFk,
+ created)
+ SELECT t.id ticketFk,
+ t.nickname,
+ am.name,
+ am.id,
+ t.shipped,
+ s.name,
+ sat.supplierFk,
+ t.created
FROM vn.ticket t
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.warehouse w ON w.id = t.warehouseFk AND w.code IN ('VNH','FLM')
- AND t.shipped BETWEEN vDateFrom AND TIMESTAMPADD(HOUR, 23, vDateTo);
-
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ AND w.code IN ('VNH','FLM')
+ AND t.shipped BETWEEN vDateFrom AND util.dayend(vDateTo)
+ JOIN vn.agency a ON a.id = am.agencyFk
+ LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
+ LEFT JOIN vn.supplier s ON s.id = sat.supplierFk;
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
CREATE TEMPORARY TABLE tmp.ticket
(ticketFk INT(11) PRIMARY KEY)
SELECT ticketFk
FROM tmp.ticketFloramondo;
-
+
-- Freight
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(sc.value * s.quantity) freight, t.ticketFk
@@ -70073,7 +70300,7 @@ BEGIN
JOIN tmp.ticket t ON t.ticketFk = ts.ticketFk
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.freight = tf.freight + sb.service;
-
+
-- Expedition Count
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT COUNT(e.id) expeditionCount, t.ticketFk
@@ -70081,7 +70308,7 @@ BEGIN
RIGHT JOIN tmp.ticket t ON t.ticketFk = e.ticketFk
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.expeditionCount = sb.expeditionCount;
-
+
-- Margin
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(IF(ct.code = 'COST',sc.value, 0)) cost,
@@ -70094,17 +70321,17 @@ BEGIN
JOIN tmp.ticket t ON t.ticketFk = s.ticketFk
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.margin = sb.margin / sb.cost;
-
+
-- Trolleys
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(tp.quantity) trolleys, t.ticketFk
FROM vn.ticketPackaging tp
JOIN tmp.ticket t ON t.ticketFk = tp.ticketFk
- JOIN vn.packaging p ON p.id = tp.packagingFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
WHERE p.isTrolley
- GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.trolleys = sb.trolleys;
-
+
-- Pallets
UPDATE tmp.ticketFloramondo tf
JOIN (SELECT SUM(tp.quantity) pallets, t.ticketFk
@@ -70114,12 +70341,11 @@ BEGIN
WHERE p.isPallet
GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
SET tf.pallets = sb.pallets;
-
+
SELECT * FROM tmp.ticketFloramondo;
-
+
DROP TEMPORARY TABLE tmp.ticket;
DROP TEMPORARY TABLE tmp.ticketFloramondo;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70290,7 +70516,7 @@ BEGIN
DECLARE vAvailableCache INT;
DECLARE vVisibleCache INT;
- CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, util.VN_CURDATE());
+ CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, CURDATE());
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
CALL `vn`.`zoneClosure_recalc`();
@@ -70317,7 +70543,7 @@ BEGIN
AND s.isPicked = FALSE
AND s.reserved = FALSE
AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND NOT i.generic
AND t.warehouseFk = vWarehouseFk;
@@ -70336,7 +70562,7 @@ BEGIN
AND s.isPicked = FALSE
AND s.reserved = FALSE
AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND NOT i.generic
AND t.warehouseFk = vWarehouseFk;
@@ -70357,7 +70583,7 @@ BEGIN
AND s.isPicked = FALSE
AND s.reserved = FALSE
AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND t.shipped BETWEEN CURDATE() AND util.dayend(CURDATE())
AND NOT i.generic
AND t.warehouseFk = vWarehouseFk;
@@ -70404,8 +70630,8 @@ BEGIN
LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id
LEFT JOIN vn.state st2 ON st2.id = tst.stateFk
WHERE (t.id IS NULL
- OR (vDated > util.VN_CURDATE())
- OR (vDated = util.VN_CURDATE() AND vHour >= zc.`hour`))
+ OR (vDated > CURDATE())
+ OR (vDated = CURDATE() AND vHour >= zc.`hour`))
AND ts.etd <= vHour
GROUP BY ts.ticketFk, t.id
ORDER BY ts.etd, ts.ticketFk;
@@ -70603,7 +70829,7 @@ BEGIN
WHERE s.ticketFk = vSelf;
UPDATE vn.ticket t
- SET t.shipped = TIMESTAMPADD(YEAR, - YEAR(util.VN_NOW()) MOD 2000, t.shipped )
+ SET t.shipped = TIMESTAMPADD(YEAR, - YEAR(NOW()) MOD 2000, t.shipped )
WHERE t.id = vSelf;
END ;;
@@ -70811,14 +71037,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_requestRecalc` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_requestRecalc`(vSelf INT)
proc: BEGIN
@@ -70831,7 +71057,7 @@ proc: BEGIN
LEAVE proc;
END IF;
- INSERT IGNORE INTO ticketRecalc SET ticketFk = vSelf;
+ INSERT INTO ticketRecalc SET ticketFk = vSelf;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70860,15 +71086,14 @@ BEGIN
SELECT stateFk INTO vStateFk
FROM ticketState
- WHERE ticketFk = vSelf;
+ WHERE ticketFk = vSelf;
SELECT nextStateFk INTO vNewStateFk
FROM state
- WHERE id = vStateFk;
+ WHERE id = vStateFk;
INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- VALUES (vNewStateFk, vSelf, account.myUser_getId());
-
+ VALUES (vNewStateFk, vSelf, account.myUser_getId());
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70887,40 +71112,43 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setParking`(IN `vTicketFk` VARCHAR(8), IN `vParkingFk` INT)
proc: BEGIN
+/**
+ * Aparca un ticket en un parking
+ *
+ * @param vTicketFk id del ticket
+ * @param vParkingFk id del parking
+ */
DECLARE vDone INT DEFAULT FALSE;
- DECLARE vCollectionTicketFk INT;
- DECLARE vCursor CURSOR FOR
-
- SELECT IFNULL(tc2.ticketFk, t.id)
- FROM ticket t
- LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
- LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
- WHERE t.id = vTicketFk;
+ DECLARE vCollectionTicketFk INT;
+ DECLARE vCursor CURSOR FOR
+ SELECT IFNULL(tc2.ticketFk, t.id)
+ FROM ticket t
+ LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
+ LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
+ WHERE t.id = vTicketFk;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
INSERT INTO vn.ticketParking(ticketFk, parkingFk)
- SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
- FROM ticket t
- LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
- LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
- WHERE t.id = vTicketFk
- ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
+ SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
+ FROM ticket t
+ LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
+ LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
+ WHERE t.id = vTicketFk
+ ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
- OPEN vCursor;
- l: LOOP
+ OPEN vCursor;
+ l: LOOP
+ FETCH vCursor INTO vCollectionTicketFk;
- FETCH vCursor INTO vCollectionTicketFk;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
- IF vDone THEN
- LEAVE l;
- END IF;
+ CALL vn.ticket_setNextState(vCollectionTicketFk);
+ END LOOP;
- CALL vn.ticket_setNextState(vCollectionTicketFk);
-
- END LOOP;
-
- CLOSE vCursor;
+ CLOSE vCursor;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70939,36 +71167,33 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setPreviousState`(vTicketFk INT)
BEGIN
-
DECLARE vControlFk INT;
-
- SELECT MAX(inter_id) INTO vControlFk
+
+ SELECT MAX(inter_id) INTO vControlFk
FROM vncontrol.inter
- WHERE Id_Ticket = vTicketFk;
-
+ WHERE Id_Ticket = vTicketFk;
+
IF (SELECT s.code
- FROM vn.state s
- JOIN vncontrol.inter i ON i.state_id = s.id
- WHERE i.inter_id = vControlFk)
+ FROM vn.state s
+ JOIN vncontrol.inter i ON i.state_id = s.id
+ WHERE i.inter_id = vControlFk)
= 'PREVIOUS_PREPARATION' THEN
-
- SELECT inter_id
+ SELECT inter_id
INTO vControlFk
- FROM vncontrol.inter i
+ FROM vncontrol.inter i
JOIN vn.state s ON i.state_id = s.id
WHERE Id_Ticket = vTicketFk
AND inter_id < vControlFk
- AND s.code != 'PREVIOUS_PREPARATION'
+ AND s.code != 'PREVIOUS_PREPARATION'
ORDER BY inter_id DESC
- LIMIT 1;
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ LIMIT 1;
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
SELECT s.nextStateFk, i.Id_Ticket, account.myUser_getId()
FROM vncontrol.inter i
JOIN vn.state s ON i.state_id = s.id
- WHERE inter_id = vControlFk;
-
- END IF;
+ WHERE inter_id = vControlFk;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70985,31 +71210,41 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(vTicketFk INT, vStateCode VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(vSelf INT, vStateCode VARCHAR(255))
BEGIN
-
- /* Modifica el estado de un ticket
- *
- * @param vTicketFk el id del ticket
- * @param vStateCode estado a modificar del ticket
- *
- */
-
+/**
+ * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
+ *
+ * @param vSelf el id del ticket
+ * @param vStateCode estado a modificar del ticket
+ */
DECLARE vAlertLevel INT;
+ DECLARE vCurrentStateCode VARCHAR(255);
+ DECLARE vCanChangeState BOOL;
+ DECLARE vPackedState INT;
- SELECT s.alertLevel INTO vAlertLevel
- FROM vn.state s
- JOIN vn.ticketState ts ON ts.stateFk = s.id
- WHERE ts.ticketFk = vTicketFk;
-
- IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
-
+ SELECT s.alertLevel, s.`code`
+ INTO vAlertLevel, vCurrentStateCode
+ FROM state s
+ JOIN ticketState ts ON ts.stateFk = s.id
+ WHERE ts.ticketFk = vSelf;
+
+ SELECT id INTO vPackedState
+ FROM alertLevel
+ WHERE code = 'PACKED';
+
+ SET vCanChangeState = (vStateCode <> 'ON_CHECKING' OR vAlertLevel < vPackedState)
+ AND NOT (
+ vCurrentStateCode IN ('CHECKED', 'CHECKING')
+ AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
+ );
+
+ IF vCanChangeState THEN
INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT id, vTicketFk, account.myUser_getId()
- FROM vn.state
- WHERE `code` = vStateCode collate utf8_unicode_ci;
-
- END IF;
+ SELECT id, vSelf, account.myUser_getId()
+ FROM state
+ WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -71056,7 +71291,7 @@ proc:BEGIN
UPDATE vn.ticket
SET landed = vDated + 1,
shipped = vDated,
- nickname = CONCAT('(',DAY(util.VN_CURDATE()),') ', nickname )
+ nickname = CONCAT('(',DAY(curdate()),') ', nickname )
WHERE id = vTicketFk;
SELECT CONCAT("Se ha cambiado el ticket ", vTicketFk, " al dia ", vDated);
@@ -71406,20 +71641,19 @@ BEGIN
at2.discountRate,
cl.hours_week hoursWeek,
at2.isAllowedToWork
- FROM vn.time t
+ FROM time t
LEFT JOIN postgresql.business b ON t.dated BETWEEN b.date_start AND IFNULL(b.date_end, vDatedTo )
LEFT JOIN postgresql.profile pr ON b.client_id = pr.profile_id
- LEFT JOIN postgresql.person p ON pr.person_id = p.person_id
- LEFT JOIN vn.worker w ON p.id_trabajador = w.id
+ LEFT JOIN worker w ON w.id = pr.workerFk
JOIN tmp.`user` u ON u.userFK = w.userFK
JOIN postgresql.business_labour bl ON b.business_id = bl.business_id
LEFT JOIN postgresql.business_labour_payroll bp ON bl.business_id = bp.business_id
LEFT JOIN postgresql.professional_category pc ON bl.professional_category_id = pc.professional_category_id
- LEFT JOIN vn.workCenter wc ON bl.workcenter_id = wc.id
+ LEFT JOIN workCenter wc ON bl.workcenter_id = wc.id
LEFT JOIN postgresql.calendar_labour_type cl ON bl.calendar_labour_type_id = cl.calendar_labour_type_id
LEFT JOIN postgresql.journey j ON j.business_id = b.business_id AND j.day_id=WEEKDAY(t.dated)+1
LEFT JOIN postgresql.calendar_employee ce ON ce.business_id=b.business_id AND ce.date = t.dated
- LEFT JOIN vn.absenceType at2 ON at2.id = ce.calendar_state_id
+ LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
GROUP BY w.userFk,dated
)sub;
@@ -71441,7 +71675,7 @@ BEGIN
WHERE permissionRate <> 0;
UPDATE tmp.timeBusinessCalculate t
- JOIN vn.calendarHolidays ch ON ch.dated = t.dated
+ JOIN calendarHolidays ch ON ch.dated = t.dated
JOIN postgresql.business_labour bl ON bl.business_id = t.businessFk AND bl.workcenter_id = ch.workcenterFk
SET t.timeWorkSeconds = 0,
t.timeWorkSexagesimal = 0,
@@ -71517,17 +71751,16 @@ BEGIN
SELECT DISTINCT w.userFk
FROM postgresql.business AS b
LEFT JOIN postgresql.profile AS pr ON pr.profile_id = b.client_id
- LEFT JOIN postgresql.person AS p ON p.person_id = pr.person_id
LEFT JOIN postgresql.business_labour AS bl ON b.business_id = bl.business_id
- LEFT JOIN vn.worker AS w ON p.id_trabajador = w.id
- LEFT JOIN vn.department AS d ON bl.department_id = d.id
- WHERE ((b.date_start BETWEEN vDatedFrom AND vDatedTo OR b.date_end BETWEEN vDatedFrom AND vDatedTo) OR
- (b.date_end IS NULL AND b.date_start <= vDatedTo) OR
- (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
- ) AND bl.department_id = vDepartmentFk
+ LEFT JOIN worker AS w ON w.id = pr.workerFk
+ LEFT JOIN department AS d ON bl.department_id = d.id
+ WHERE (b.date_start BETWEEN vDatedFrom AND vDatedTo
+ OR IFNULL(b.date_end, vDatedTo) BETWEEN vDatedFrom AND vDatedTo
+ OR (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
+ ) AND bl.department_id = vDepartmentFk
ORDER BY b.date_end DESC;
- CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo);
+ CALL timeBusiness_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
@@ -71856,17 +72089,16 @@ BEGIN
SELECT DISTINCT w.userFk
FROM postgresql.business AS b
LEFT JOIN postgresql.profile AS pr ON pr.profile_id = b.client_id
- LEFT JOIN postgresql.person AS p ON p.person_id = pr.person_id
LEFT JOIN postgresql.business_labour AS bl ON b.business_id = bl.business_id
- LEFT JOIN vn.worker AS w ON p.id_trabajador = w.id
- LEFT JOIN vn.department AS d ON bl.department_id = d.id
- WHERE ((b.date_start BETWEEN vDatedFrom AND vDatedTo OR b.date_end BETWEEN vDatedFrom AND vDatedTo) OR
- (b.date_end IS NULL AND b.date_start <= vDatedTo) OR
- (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
+ LEFT JOIN worker AS w ON w.id = pr.workerFk
+ LEFT JOIN department AS d ON bl.department_id = d.id
+ WHERE (b.date_start BETWEEN vDatedFrom AND vDatedTo
+ OR IFNULL(b.date_end, vDatedTo) BETWEEN vDatedFrom AND vDatedTo
+ OR (b.date_start <= vDatedFrom AND b.date_end >= vDatedTo)
) AND bl.department_id = vDepartmentFk
ORDER BY b.date_end DESC;
- CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
+ CALL timeControl_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
@@ -72083,7 +72315,7 @@ BEGIN
FROM hedera.tpvTransaction t
WHERE t.receiptFk IS NULL
AND t.status = 'ok'
- AND t.created < DATE_ADD(util.VN_NOW(),INTERVAL - 2 DAY)
+ AND t.created < DATE_ADD(NOW(),INTERVAL - 2 DAY)
GROUP BY t.clientFk;
END ;;
@@ -72121,7 +72353,7 @@ BEGIN
JOIN vn.entry e ON e.id = b.entryFk
JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN vn.agencyMode a ON a.id = tr.agencyFk
+ JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk
JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk
JOIN vn.volumeConfig vc
@@ -72153,7 +72385,7 @@ BEGIN
count(DISTINCT e.id) numEntradas,
FLOOR(sum(item_getVolume(b.itemFk, b.packageFk) * b.stickers / 1000000 )) AS m3
FROM vn.travel tr
- JOIN vn.agencyMode a ON a.id = tr.agencyFk
+ JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
JOIN vn.entry e ON e.travelFk = tr.id
JOIN vn.buy b ON b.entryFk = e.id
WHERE tr.landed BETWEEN vFromDated AND vToDated
@@ -72198,14 +72430,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `travel_clone` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_clone`(vSelf INT, vDays INT, OUT vNewTravelFk INT)
BEGIN
@@ -72221,7 +72453,7 @@ BEGIN
SELECT tr.id INTO vNewTravelFk
FROM vn.travel tr
- JOIN vn.travel tr2 USING(shipped, warehouseInFk, warehouseOutFk, agencyFk, `ref`)
+ JOIN vn.travel tr2 USING(shipped, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`)
WHERE tr2.id = vSelf
AND tr.landed = TIMESTAMPADD(DAY, vDays, tr2.landed);
@@ -72235,7 +72467,7 @@ BEGIN
landingHour,
warehouseInFk,
warehouseOutFk,
- agencyFk,
+ agencyModeFk,
`ref`,
cargoSupplierFk)
SELECT shipped,
@@ -72244,7 +72476,7 @@ BEGIN
landingHour,
warehouseInFk,
warehouseOutFk,
- agencyFk,
+ agencyModeFk,
`ref`,
cargoSupplierFk
FROM vn.travel
@@ -72329,7 +72561,7 @@ BEGIN
INSERT INTO entry (
supplierFk,
ref,
- isInventory,
+ isExcludedFromAvailable,
isConfirmed,
isOrdered,
isRaid,
@@ -72343,7 +72575,7 @@ BEGIN
invoiceInFk)
SELECT supplierFk,
ref,
- isInventory,
+ isExcludedFromAvailable,
isConfirmed,
isOrdered,
isRaid,
@@ -72618,7 +72850,7 @@ BEGIN
DECLARE vDone BOOLEAN DEFAULT FALSE;
DECLARE vRsTravel CURSOR FOR
SELECT travelFk,
- @a := TIMESTAMPADD(DAY,vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay,util.VN_CURDATE()),
+ @a := TIMESTAMPADD(DAY,vCounter * 7 - WEEKDAY(CURDATE()) - 1 + weekDay,CURDATE()),
@a := TIMESTAMPADD(DAY,duration,@a),
warehouseOutFk,
warehouseInFk,
@@ -72631,8 +72863,8 @@ BEGIN
SET vCounter = vSinceWeek;
vWeekLoop :LOOP
- INSERT IGNORE INTO travel (shipped, landed, warehouseOutFk, warehouseInFk, agencyFk, ref, cargoSupplierFk, kg)
- SELECT @a := TIMESTAMPADD(DAY, vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay,util.VN_CURDATE()),
+ INSERT IGNORE INTO travel (shipped, landed, warehouseOutFk, warehouseInFk, agencyModeFk, ref, cargoSupplierFk, kg)
+ SELECT @a := TIMESTAMPADD(DAY, vCounter * 7 - WEEKDAY(CURDATE()) - 1 + weekDay,CURDATE()),
@a := TIMESTAMPADD(DAY, duration, @a),
warehouseOutFk,
warehouseInFk,
@@ -73016,7 +73248,6 @@ BEGIN
* @param vWorkerFk
* @return tmp.workerCalendarCalculateYear (days, hours, daysEnjoyed, hoursEnjoyed)
*/
-
DECLARE vDone BOOL;
DECLARE vBusinessFk INT;
@@ -73024,9 +73255,8 @@ BEGIN
SELECT b.business_id
FROM postgresql.business b
LEFT JOIN postgresql.profile AS pr ON pr.profile_id = b.client_id
- LEFT JOIN postgresql.person AS p ON p.person_id = pr.person_id
WHERE vYear BETWEEN YEAR(b.date_start) AND IFNULL(YEAR(b.date_end), vYear )
- AND p.id_trabajador = vWorkerFk;
+ AND pr.workerFk = vWorkerFk;
DECLARE CONTINUE HANDLER FOR NOT FOUND
SET vDone = TRUE;
@@ -73082,19 +73312,21 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreate`(
- vFirstname VARCHAR(50),
- vSurnames VARCHAR(50),
- vWorkerCode CHAR(3),
- vBossFk INT,
- vUserFk INT
+ vFirstname VARCHAR(50),
+ vLastName VARCHAR(50),
+ vCode CHAR(3),
+ vBossFk INT,
+ vUserFk INT,
+ vFi VARCHAR(15) ,
+ vBirth DATE
)
BEGIN
/**
* Create new worker
*
*/
- INSERT INTO worker(id, code, firstName, lastName, userFk, bossFk)
- VALUES (vUserFk, vWorkerCode, vFirstname, vSurnames, vUserFk, vBossFk);
+ INSERT INTO worker(id, code, firstName, lastName, userFk, bossFk, fi, birth)
+ VALUES (vUserFk, vCode, vFirstname, vLastName, vUserFk, vBossFk, vFi, vBirth);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73165,30 +73397,24 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.workerDepartmentByDate;
CREATE TEMPORARY TABLE tmp.workerDepartmentByDate
ENGINE = MEMORY
- SELECT
- w.userFk,
- p.name,
- p.firstname,
- d.name AS department,
- d.id as departmentFk,
+ SELECT w.userFk,
+ w.lastName name,
+ w.firstName firstname,
+ d.name department,
+ d.id departmentFk,
b.date_start,
d.isProduction,
- CAST(12 * blp.importepactado / clt.hours_week / 52 AS DECIMAL(10,2)) as costeHora ,
- p.nif
-
- FROM postgresql.person p
- JOIN postgresql.profile pr ON p.person_id = pr.person_id
+ CAST(12 * blp.importepactado / clt.hours_week / 52 AS DECIMAL(10,2)) costeHora,
+ w.fi nif
+ FROM postgresql.profile pr
JOIN postgresql.business b ON b.client_id = pr.profile_id
JOIN postgresql.business_labour bl ON bl.business_id = b.business_id
JOIN postgresql.calendar_labour_type clt ON clt.calendar_labour_type_id = bl.calendar_labour_type_id
JOIN postgresql.business_labour_payroll blp ON blp.business_id = b.business_id
- JOIN vn.department d ON d.id = bl.department_id
- JOIN vn.worker w ON w.id = p.id_trabajador
- WHERE b.date_start <= vDate AND IFNULL(b.date_end,'3000-01-01') > vDate
- ;
-
- -- SELECT * FROM tmp.workerDepartmentByDate;
-
+ JOIN department d ON d.id = bl.department_id
+ JOIN worker w ON w.id = pr.workerFk
+ WHERE b.date_start <= vDate
+ AND (b.date_end > vDate OR b.date_end IS NULL);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73208,7 +73434,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerDisable`(vUserId int)
mainLabel:BEGIN
- IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > util.VN_CURDATE() OR dated IS NULL)) > 0 THEN
+ IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > CURDATE() OR dated IS NULL)) > 0 THEN
LEAVE mainLabel;
END IF;
DELETE FROM account.account
@@ -73252,21 +73478,19 @@ BEGIN
DECLARE rs CURSOR FOR
SELECT a.id
- FROM ((SELECT * FROM (select date_end,date_start,business_id, client_id
- FROM postgresql.business
- ORDER BY client_id, date_end IS NULL DESC , date_end DESC
- LIMIT 10000000000000000000)
- c GROUP BY client_id) c
- INNER JOIN postgresql.business b ON c.client_id = b.client_id AND c.business_id = b.business_id
- INNER JOIN postgresql.profile pr ON b.client_id = pr.profile_id
- INNER JOIN postgresql.person p ON pr.person_id = p.person_id
-
- INNER JOIN vn.worker w ON p.id_trabajador = w.id)
- INNER JOIN account.account a ON w.userFk = a.id
- WHERE ((b.date_end) IS NOT NULL
- AND (b.date_end) < util.VN_CURDATE()
- AND (b.date_end) > TIMESTAMPADD(DAY, -70,util.VN_CURDATE()) );
-
+ FROM (SELECT client_id, business_id
+ FROM (SELECT business_id, client_id
+ FROM postgresql.business
+ ORDER BY client_id, date_end IS NULL DESC , date_end DESC
+ LIMIT 10000000000000000000)sub
+ GROUP BY client_id)sub2
+ JOIN postgresql.business b ON sub2.client_id = b.client_id AND sub2.business_id = b.business_id
+ JOIN postgresql.profile pr ON b.client_id = pr.profile_id
+ JOIN account.account a ON pr.workerFk = a.id
+ WHERE b.date_end IS NOT NULL
+ AND b.date_end < CURDATE()
+ AND b.date_end > TIMESTAMPADD(DAY, -70, CURDATE());
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
OPEN rs;
@@ -73343,22 +73567,25 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(vDatedFrom DATE, vDatedTo DATE, vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(
+ vDatedFrom DATE,
+ vDatedTo DATE,
+ vWorkerFk INT)
BEGIN
/**
- * Actualiza la tabla workerJourney para que actue como caché permanente revisable de las jornadas laborales.
+ * Actualiza la tabla workerJourney para que actue como caché permanente revisable
+ * de las jornadas laborales.
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
* @param vWorkerFk, en caso de pasar 0 ó NULL se aplica a todos
*/
-
DECLARE vDatedTimeTo DATETIME;
DECLARE vMaxTimePerDay INT;
DECLARE vMinHoursToBreak DECIMAL(10,2);
DECLARE vBreakHours DECIMAL(10,2);
DECLARE vMonthByYear INT;
DECLARE vWeeksByYear INT DEFAULT 52;
- DECLARE vMonthsByYear INT DEFAULT 12;
+ DECLARE vMonthsByYear INT DEFAULT 12;
DECLARE vDaysByWeek INT DEFAULT 5;
DECLARE vDatedFromYesterday DATETIME;
DECLARE vDatedToTomorrow DATETIME;
@@ -73382,10 +73609,10 @@ BEGIN
INSERT IGNORE INTO workerJourney(userFk, dated, businessFk)
SELECT w.workerFk, t.dated, w.businessFk
FROM workerLabour w
- JOIN time t ON t.dated BETWEEN w.started AND IFNULL(w.ended,util.VN_CURDATE())
+ JOIN time t ON t.dated BETWEEN w.started AND IFNULL(w.ended,CURDATE())
WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR w.workerFk = vWorkerFk)
- ORDER BY w.workerFk, t.dated, w.businessFk;
+ ORDER BY w.workerFk, t.dated, w.businessFk;
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
@@ -73397,12 +73624,14 @@ BEGIN
CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
SELECT id userFk
- FROM vn.worker w;
+ FROM worker w;
END IF;
UPDATE workerJourney wj
JOIN tmp.timeControlCalculate t ON wj.dated = t.dated AND wj.userFk = t.userFk
- SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak, t.timeWorkDecimal - vBreakHours, t.timeWorkDecimal) AS DECIMAL (10,2)),
+ SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak,
+ t.timeWorkDecimal - vBreakHours,
+ t.timeWorkDecimal) AS DECIMAL (10,2)),
wj.lunch = IF(t.timeWorkDecimal >= vMinHoursToBreak , vBreakHours , 0)
WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
AND NOT wj.isPaid
@@ -73410,11 +73639,11 @@ BEGIN
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk);
-- NOCTURNIDAD
- CALL vn.timeControl_getError(vDatedFrom, vDatedTimeTo);
+ CALL timeControl_getError(vDatedFrom, vDatedTimeTo);
SET @vIsOdd := TRUE;
SET @vDated := NULL;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControl;
CREATE TEMPORARY TABLE tmp.workerTimeControl
(INDEX (userFk), INDEX (timed))
@@ -73442,68 +73671,89 @@ BEGIN
`direction` enum('in', 'out','middle')
) ENGINE=MEMORY;
- SET @counter := 0;
- SET @vIsOdd := FALSE;
+ SET @vIsOdd := TRUE;
+ SET @lastUserFk := NULL;
+ SET @lastDirection := NULL;
-- Cambio de dia en medio de un descanso
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1 id, userFk, util.dayEnd(dated) timed, 'middle' direction
- FROM(SELECT wtc.userFk,
+ SELECT @vCont:= @vCont + 1,
+ lastUserFk,
+ util.dayEnd(dated),
+ 'middle'
+ FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL),
DATE(@lastTimed) dated,
- (@vIsOdd := NOT @vIsOdd) isOdd,
- IF(@vIsOdd AND wtc.direction = 'middle' AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
- @lastTimed := wtc.timed
+ @lastUserFk lastUserFk,
+ IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
+ IF(@vIsOdd
+ AND @lastDirection = 'middle'
+ AND (DATE(@lastTimed) <> date(timed)
+ OR @lastUserFk <> userFk), TRUE, FALSE) hasBreak,
+ @lastTimed := wtc.timed,
+ @lastUserFk := userFk,
+ @lastDirection := direction
FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed
- )sub
+ ORDER BY wtc.userFk, wtc.timed)sub
WHERE hasBreak;
- SET @counter := 0;
- SET @vIsOdd := FALSE;
+ SET @vIsOdd := TRUE;
+ SET @lastUserFk := NULL;
+ SET @lastDirection := NULL;
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1, userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'middle'
- FROM(SELECT wtc.userFk,
+ SELECT @vCont:= @vCont + 1,
+ lastUserFk,
+ DATE_ADD(sub.dated, INTERVAL 1 DAY),
+ 'middle'
+ FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL),
DATE(@lastTimed) dated,
- (@vIsOdd := NOT @vIsOdd) isOdd,
- IF(@vIsOdd AND wtc.direction = 'middle' AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
- @lastTimed := wtc.timed
+ @lastUserFk lastUserFk,
+ IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
+ IF(@vIsOdd
+ AND @lastDirection = 'middle'
+ AND (DATE(@lastTimed)<>date(timed)
+ OR @lastUserFk<>userFk), TRUE, FALSE) hasBreak,
+ @lastTimed := wtc.timed,
+ @lastUserFk := userFk,
+ @lastDirection := direction
FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed
- )sub
+ ORDER BY wtc.userFk, wtc.timed)sub
WHERE hasBreak;
-- Cambio de dia
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1 id, sub.userFk, util.dayEnd(sub.dated) timed, 'out' direction
- FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
- AND tce.id IS NULL
- GROUP BY wtc.userFk, DATE(wtc.timed)
- ) sub
- JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed AND wtc.userFk = sub.userFk
- WHERE wtc.direction <> 'out';
+ SELECT @vCont:= @vCont + 1,
+ wtc.userFk,
+ util.dayEnd(date(wtc.timed)),
+ 'out'
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND wtc.direction <> 'out'
+ GROUP BY wtc.userFk, DATE(wtc.timed);
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1, sub.userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'in'
- FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
- AND tce.id IS NULL
- GROUP BY wtc.userFk, DATE(wtc.timed)
- ) sub
- JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed AND wtc.userFk = sub.userFk
- WHERE wtc.direction <> 'out';
+ SELECT @vCont:= @vCont + 1,
+ wtc.userFk,
+ DATE_ADD(date(wtc.timed), INTERVAL 1 DAY),
+ 'in'
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND wtc.direction <> 'out'
+ GROUP BY wtc.userFk, DATE(wtc.timed);
INSERT INTO tmp.workerTimeControl (id, userFk, timed, direction)
SELECT id, userFk, timed, direction
FROM tmp.workerTimeControlAux;
+ SET @lastUserFk := NULL;
+ SET @vIsOdd := TRUE;
+ SET @vDated := NULL;
+ SET @vLastTimed := NULL;
+
UPDATE workerJourney wj
JOIN (SELECT sub.dated, userFk, SUM(NigthlyHours) NigthlyHours
FROM(SELECT (@vIsOdd := NOT @vIsOdd) isOdd,
@@ -73512,8 +73762,9 @@ BEGIN
IF(direction='in', @vDated := DATE(wtc.timed), @vDated ) dated,
wtc.userFk,
IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay,
- vn.workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
- 0) NigthlyHours
+ workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
+ 0) NigthlyHours,
+ @lastUserFk := userFk
FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
FROM tmp.workerTimeControl wtc
LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
@@ -73522,6 +73773,7 @@ BEGIN
ORDER BY userFk, timed ASC
LIMIT 10000000000000000000
) wtc
+ ORDER BY wtc.userFk, wtc.timed
)sub
WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo
GROUP BY userFk, sub.dated
@@ -73531,12 +73783,18 @@ BEGIN
AND NOT isUpdated
AND night.NigthlyHours <> 0;
+
-- Horas téoricas y precio de la hora ordinaria
UPDATE workerJourney wj
- JOIN postgresql.business_labour_payroll blp ON blp.business_id = wj.businessFk
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
- SET wj.priceOrdinaryHour = (vMonthsByYear * blp.importepactado) / (vWeeksByYear * cl.hours_week),
+ JOIN postgresql.business_labour_payroll blp
+ ON blp.business_id = wj.businessFk
+ JOIN postgresql.business_labour bl
+ ON bl.business_id = wj.businessFk
+ JOIN postgresql.calendar_labour_type cl
+ ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
+ SET wj.priceOrdinaryHour =
+ (vMonthsByYear * blp.importepactado) /
+ (vWeeksByYear * cl.hours_week),
wj.contractJourney = cl.hours_week / vDaysByWeek
WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
@@ -73561,8 +73819,10 @@ BEGIN
-- Elimina el precio de las horas extras para los contratos parciales.
UPDATE workerJourney wj
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
+ JOIN postgresql.business_labour bl
+ ON bl.business_id = wj.businessFk
+ JOIN postgresql.calendar_labour_type cl
+ ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
SET wj.priceExtraHour = 0
WHERE cl.isPartial
AND wj.dated BETWEEN vDatedFrom AND vDatedTo
@@ -73572,7 +73832,8 @@ BEGIN
-- Ausencias
UPDATE workerJourney wj
- JOIN businessCalendar bc ON bc.businessFk = wj.businessFk AND bc.dated = wj.dated
+ JOIN businessCalendar bc ON bc.businessFk = wj.businessFk
+ AND bc.dated = wj.dated
JOIN absenceType ab ON ab.id = bc.absenceTypeFk
JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
SET wj.permission = ab.permissionRate * wj.contractJourney,
@@ -73790,7 +74051,7 @@ BEGIN
CALL vn.workerTimeControlSOWP(vUserFk , vDated);*/
- CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,util.VN_NOW(),FALSE);
+ CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,NOW(),FALSE);
END ;;
@@ -73964,7 +74225,7 @@ BEGIN
@cont cont,
@lastUserFk := userFk
FROM workerTimeControl wtc
- WHERE wtc.timed BETWEEN TIMESTAMPADD(YEAR,-1,util.VN_CURDATE()) AND util.dayEnd(util.VN_CURDATE())
+ WHERE wtc.timed BETWEEN TIMESTAMPADD(YEAR,-1,CURDATE()) AND util.dayEnd(CURDATE())
ORDER BY userFk, timed
LIMIT 10000000000000000000)sub
GROUP BY cont
@@ -74034,10 +74295,10 @@ proc: BEGIN
WHERE w.id = vUserFk;
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
+ IF UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
-- VERIFICAR DESCANSO DIARIO
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
+ IF UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
SELECT "Descansos 12 h" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
@@ -74063,12 +74324,10 @@ proc: BEGIN
FROM postgresql.calendar_employee ce
JOIN postgresql.business b USING(business_id)
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN vn.absenceType at2 ON at2.id = ce.calendar_state_id
- JOIN worker w ON w.id = p.id_trabajador
- WHERE ce.date = util.VN_CURDATE()
+ JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+ WHERE ce.date = CURDATE()
AND at2.isAllowedToWork = FALSE
- AND w.userFk = vUserFk
+ AND pr.workerFk = vUserFk
LIMIT 1;
IF(LENGTH(vCalendarStateType)) THEN
@@ -74085,9 +74344,7 @@ proc: BEGIN
IF (SELECT COUNT(*)
FROM postgresql.business b
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN worker w ON w.id = p.id_trabajador
- WHERE w.userFk = vUserFk
+ WHERE pr.workerFk = vUserFk
AND b.date_start <= vDated
AND IFNULL(b.date_end,vDated) >= vDated
) = 0 THEN
@@ -74101,19 +74358,19 @@ proc: BEGIN
-- VERIFICAR DESCANSO SEMANAL
SET @vHasBreakWeek:= FALSE;
- SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND));
+ SET @vLastTimed:= UNIX_TIMESTAMP((NOW() - INTERVAL vWeekScope SECOND));
DROP TEMPORARY TABLE IF EXISTS tmp.trash;
CREATE TEMPORARY TABLE tmp.trash
SELECT IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
@vLastTimed:= UNIX_TIMESTAMP(timed)
FROM workerTimeControl
- WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
+ WHERE timed>= (NOW() - INTERVAL vWeekScope SECOND)
AND userFk= vUserFk
AND direction IN ('in','out')
ORDER BY timed ASC;
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
+ IF UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
SELECT "Descansos 36 h" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
@@ -74126,7 +74383,7 @@ proc: BEGIN
ELSE -- DIA ACTUAL
-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
- SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked
+ SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(NOW()), 0) INTO vTimedWorked
FROM workerTimeControl wtc
WHERE userFk = vUserFk
AND timed >= vLastIn
@@ -74350,7 +74607,7 @@ BEGIN
/**
* Verifica si el empleado puede fichar
* @param vWorker Identificador del trabajador
- * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = util.VN_NOW()
+ * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW()
* @param vDirection solo se pueden pasa los valores del campo
* workerTimeControl.direction ENUM('in', 'out', 'middle')
* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
@@ -74446,7 +74703,7 @@ BEGIN
END;
IF (vTimed IS NULL) THEN
- SET vTimed = util.VN_NOW();
+ SET vTimed = NOW();
SET vManual = FALSE;
END IF;
@@ -74509,7 +74766,7 @@ BEGIN
LIMIT 1;
-- FICHADAS A FUTURO
- IF vTimed > DATE_ADD(util.VN_NOW(), INTERVAL 60 SECOND) THEN
+ IF vTimed > DATE_ADD(NOW(), INTERVAL 60 SECOND) THEN
SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
CALL util.throw(vErrorCode);
END IF;
@@ -74699,7 +74956,7 @@ BEGIN
DECLARE vIsMiddleOdd BOOLEAN ;
IF (vTimed IS NULL) THEN
- SET vTimed = util.VN_NOW();
+ SET vTimed = NOW();
END IF;
SELECT timed INTO vLastIn
@@ -74714,7 +74971,7 @@ BEGIN
FROM workerTimeControl
WHERE userFk = vWorkerFk
AND direction = 'middle'
- AND timed BETWEEN vLastIn AND util.VN_NOW();
+ AND timed BETWEEN vLastIn AND NOW();
DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
CREATE TEMPORARY TABLE tmp.workerTimeControlDirection
@@ -74861,7 +75118,7 @@ BEGIN
* @return (name, surname, userFk, departmentFk, button1, button2)
* Los valores posibles para button son ('in', 'inMiddle', 'outMiddle', 'out')
*/
- CALL vn.workerTimeControl_direction(vWorkerFk, util.VN_NOW());
+ CALL vn.workerTimeControl_direction(vWorkerFk, NOW());
SELECT wi.name,
wi.surname,
@@ -75048,7 +75305,6 @@ BEGIN
JOIN user u ON u.id = tb.userFk
JOIN department d ON d.id = tb.departmentFk
JOIN postgresql.business b ON b.business_id = tb.businessFk
- JOIN company c ON c.id = b.provider_id
LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated
LEFT JOIN worker w ON w.id = u.id
LEFT JOIN `user` u2 ON u2.id = w.bossFk
@@ -75063,7 +75319,7 @@ BEGIN
)sub ON sub.userFk = u.id
WHERE d.hasToRefill AND
IFNULL(vWorkerFk,u.id) = u.id AND
- c.code = 'VNL'
+ b.companyCodeFk = 'VNL'
ORDER BY u.id, tb.dated;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
@@ -75097,7 +75353,7 @@ BEGIN
isSendMail;
UPDATE workerTimeControlMail
- SET updated = util.VN_NOW(), state = 'SENDED'
+ SET updated = NOW(), state = 'SENDED'
WHERE year = vYear AND
week = vWeek AND
IFNULL(vWorkerFk, workerFk) = workerFk ;
@@ -75227,9 +75483,10 @@ proc: LOOP
FETCH vCursor INTO vReceiver, vWorkerFk, vDated, vTimeWorkDecimal, vTimeWorkSexagesimal, vTimeTable, vTimeWorkedDecimal, vTimeWorkedSexagesimal, vAbsenceType, vBusinessFk, vPermissionRate, vIsTeleworking;
IF vWorkerFk <> vWorkerFkOld OR vDone THEN
- SELECT CONCAT( IFNULL(nif, ''), ' - ', firstName, ' ', name ) INTO vWorkerInfo
- FROM postgresql.person
- WHERE id_trabajador = vWorkerFkOld;
+ SELECT CONCAT_WS(' ', fi, firstName, lastName) INTO vWorkerInfo
+ FROM worker
+ WHERE id = vWorkerFkOld;
+
SET vHeader = CONCAT("
", vWorkerInfo , "
@@ -75458,8 +75715,8 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_sendMailByDepartm
BEGIN
DECLARE vDatedFrom, vDatedTo DATETIME;
- IF (DAYNAME(util.VN_CURDATE()) = 'miércoles') THEN
- SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
+ IF (DAYNAME(CURDATE()) = 'miércoles') THEN
+ SELECT DATE_SUB(CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
CALL vn.workerTimeControl_sendMailByDepartment(vDatedFrom, vDatedTo, NULL);
END IF;
@@ -75576,10 +75833,10 @@ BEGIN
DECLARE isEnabled BOOLEAN DEFAULT TRUE;
SELECT COUNT(*) INTO vHasSignedToday
- FROM vn.workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
+ FROM workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
SET @day := 0;
- SET @lastTimed := util.VN_NOW();
+ SET @lastTimed := NOW();
SELECT SUM(IF(interval_in_minutes >= v12hoursInMinutes,1,0)), SUM(FLOOR(interval_in_minutes/ v36hoursInMinutes)) , SUM(jornadas)
INTO vDescansos12h, vDescansos36h, vJornadas
@@ -75598,14 +75855,14 @@ BEGIN
(
SELECT day(timed) as dayNumber, dayname(timed) as dayName, timed
FROM
- (SELECT TIMESTAMPADD(DAY, -11, util.VN_NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
+ (SELECT TIMESTAMPADD(DAY, -11, NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
UNION ALL
SELECT timed, userFk
FROM vn.workerTimeControl wtc
WHERE userFk = vUserFk
AND timed >= TIMESTAMPADD(DAY, -10,vDated)
UNION ALL
- SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk
+ SELECT IF(vHasSignedToday, '2000-01-01 00:00', NOW()) as timed, vUserFk
) sub4
ORDER BY timed
) sub
@@ -75624,26 +75881,22 @@ BEGIN
GROUP BY dayNumber
) sub;
- -- Vacaciones
+ -- Vacaciones
SELECT at2.name INTO vCantWork
FROM postgresql.calendar_employee ce
JOIN postgresql.business b USING(business_id)
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN vn.absenceType at2 ON at2.id = ce.calendar_state_id
- JOIN vn.worker w ON w.id = p.id_trabajador
- WHERE ce.date = util.VN_CURDATE()
+ JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+ WHERE ce.date = CURDATE()
AND at2.isAllowedToWork = FALSE
- AND w.userFk = vUserFk
+ AND pr.workerFk = vUserFk
LIMIT 1;
-- Contrato en vigor
SELECT IF(COUNT(*),vCantWork,'Sin contrato') INTO vCantWork
FROM postgresql.business b
JOIN postgresql.profile pr ON pr.profile_id = b.client_id
- JOIN postgresql.person p ON p.person_id = pr.person_id
- JOIN vn.worker w ON w.id = p.id_trabajador
- WHERE w.userFk = vUserFk
+ WHERE pr.workerFk = vUserFk
AND b.date_start <= vDated
AND IFNULL(b.date_end,vDated) >= vDated;
@@ -75651,11 +75904,11 @@ BEGIN
IF vTabletFk <> '0' THEN
-- 1 Obtener el departamento del usuario
SELECT wtcu.departmentFk INTO vDepartmentFk
- FROM vn.workerTimeControlUserInfo wtcu
+ FROM workerTimeControlUserInfo wtcu
WHERE wtcu.userFk = vUserFk;
-- 2 Comprobar si la tablet pertenece al departamento
SELECT COUNT(td.tabletFk) INTO isEnabled
- FROM vn.tabletDepartment td
+ FROM tabletDepartment td
WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk;
END IF;
@@ -76088,7 +76341,7 @@ BEGIN
JOIN agencyMode am ON am.id= r.agencyModeFk
JOIN agency a ON a.id = am.agencyFk
JOIN workerDistributionCategory wdc ON wdc.workerFk = vWorkerFk
- JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, util.VN_CURDATE()) AND wl.workerFk = wdc.workerFk AND a.workCenterFk = wl.workCenterFk
+ JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()) AND wl.workerFk = wdc.workerFk AND a.workCenterFk = wl.workCenterFk
JOIN department v ON v.id = departmentFk
JOIN routeConfig rc
WHERE r.m3>0 AND created BETWEEN vDateFrom AND vDateTo AND
@@ -76115,7 +76368,7 @@ BEGIN
ORDER BY dated DESC LIMIT 1
) sub
JOIN routeConfig rc
- JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, util.VN_CURDATE()) AND
+ JOIN workerLabour wl ON r.created BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()) AND
wl.workerFk = sub.workerFk
JOIN department v ON v.id = departmentFk
WHERE r.m3>0 AND
@@ -76386,7 +76639,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHoursTimeIn`(vUserId INT(11))
BEGIN
INSERT INTO vn.workingHours (timeIn, userId)
- VALUES (util.VN_NOW(),vUserId);
+ VALUES (NOW(),vUserId);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76406,9 +76659,9 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHoursTimeOut`(vUserId INT(11))
BEGIN
UPDATE vn.workingHours
- SET timeOut = util.VN_NOW()
+ SET timeOut = NOW()
WHERE userId = vUserId
- AND DATE(timeIn) = util.VN_CURDATE();
+ AND DATE(timeIn) = CURDATE();
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76472,7 +76725,7 @@ proc: BEGIN
*/
DECLARE vScope INT;
DECLARE vCounter INT DEFAULT 0;
- DECLARE vShipped DATE DEFAULT util.VN_CURDATE();
+ DECLARE vShipped DATE DEFAULT CURDATE();
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
BEGIN
@@ -76958,7 +77211,7 @@ proc:BEGIN
JOIN vn.productionConfig pc
WHERE a.isOwn
AND pc.isZoneClosedByExpeditionActivated
- AND e.created >= util.VN_CURDATE()
+ AND e.created >= CURDATE()
GROUP BY t.zoneFk, t.warehouseFk
HAVING numTickets >= minTicketsToCloseZone) sub;
END ;;
@@ -77000,7 +77253,7 @@ BEGIN
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
WHERE dm.code IN ('AGENCY','DELIVERY');
- CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
+ CALL zone_getOptionsForShipment(CURDATE(),FALSE);
DROP TEMPORARY TABLE IF EXISTS tmp.zoneNodes;
CREATE TEMPORARY TABLE tmp.zoneNodes (
@@ -77068,7 +77321,7 @@ BEGIN
INSERT INTO mail (receiver,replyTo,subject,body)
SELECT 'pepe@verdnatura.es' receiver,
'noreply@verdnatura.es' replyTo,
- CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject,
+ CONCAT('Colisiones en zonas ', CURDATE()) subject,
CONCAT(vTableCollisions,
GROUP_CONCAT(sub.td SEPARATOR ''),
'') body
@@ -77294,7 +77547,7 @@ BEGIN
LEFT JOIN tmp.closedZones cz
ON cz.warehouseFk = zw.warehouseFk
AND cz.zoneFk = zw.zoneFk
- AND zo.shipped = util.VN_CURDATE()
+ AND zo.shipped = CURDATE()
WHERE z.agencyModeFk = vAgencyModeFk
AND zw.warehouseFk = vWarehouseFk
AND (ISNULL(cz.zoneFk) OR vShowExpiredZones);
@@ -77603,8 +77856,8 @@ BEGIN
IF NOT vShowExpiredZones THEN
DELETE FROM tmp.zoneOption
- WHERE shipped < util.VN_CURDATE()
- OR (shipped = util.VN_CURDATE() AND util.VN_CURTIME() > `hour`);
+ WHERE shipped < CURDATE()
+ OR (shipped = CURDATE() AND CURTIME() > `hour`);
END IF;
END ;;
DELIMITER ;
@@ -77631,7 +77884,7 @@ BEGIN
* @param vShipped The shipping date
* @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
*/
- DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
+ DECLARE vHour TIME DEFAULT TIME(NOW());
DROP TEMPORARY TABLE IF EXISTS tLandings;
CREATE TEMPORARY TABLE tLandings
@@ -77691,8 +77944,8 @@ BEGIN
IF NOT vShowExpiredZones THEN
DELETE FROM tmp.zoneOption
- WHERE vShipped < util.VN_CURDATE()
- OR (vShipped = util.VN_CURDATE() AND util.VN_CURTIME() > `hour`);
+ WHERE vShipped < CURDATE()
+ OR (vShipped = CURDATE() AND CURTIME() > `hour`);
END IF;
END ;;
DELIMITER ;
@@ -77747,7 +78000,7 @@ BEGIN
LEFT JOIN tmp.closedZones cz
ON cz.warehouseFk = zw.warehouseFk
AND cz.zoneFk = zw.zoneFk
- AND zo.shipped = util.VN_CURDATE()
+ AND zo.shipped = CURDATE()
WHERE z.agencyModeFk = vAgencyModeFk
AND (ISNULL(cz.zoneFk) OR vShowExpiredZones)
ORDER BY shipped
@@ -77797,7 +78050,7 @@ BEGIN
SELECT zo.zoneFk,
zo.`hour`etd,
- (zo.`hour` <= TIME(util.VN_NOW())) isLate,
+ (zo.`hour` <= TIME(now())) isLate,
!ISNULL(cz.zoneFk) isFull,
zw.warehouseFk,
zo.landed
@@ -77885,7 +78138,7 @@ BEGIN
DECLARE vForwardDays INT;
SELECT forwardDays INTO vForwardDays FROM zoneConfig;
- CALL util.time_createTable(util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL vForwardDays DAY));
+ CALL util.time_createTable(CURDATE(), DATE_ADD(CURDATE(), INTERVAL vForwardDays DAY));
DROP TEMPORARY TABLE IF EXISTS tLandings;
CREATE TEMPORARY TABLE tLandings
@@ -77897,7 +78150,7 @@ BEGIN
ti.dated shipped
FROM zone z
JOIN zoneEvent e ON e.zoneFk = z.id
- JOIN tmp.time ti ON ti.dated BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY, vForwardDays, util.VN_CURDATE());
+ JOIN tmp.time ti ON ti.dated BETWEEN curdate() AND TIMESTAMPADD(DAY, vForwardDays, curdate());
DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
CREATE TEMPORARY TABLE tmp.zoneOption
@@ -78195,7 +78448,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
BEGIN
- DECLARE vDate DATETIME DEFAULT TIMESTAMPADD(MONTH, -2, util.VN_CURDATE());
+ DECLARE vDate DATETIME DEFAULT TIMESTAMPADD(MONTH, -2, CURDATE());
DELETE i FROM inter i JOIN vn.ticket t ON i.Id_Ticket = t.id
WHERE t.shipped <= vDate;
END ;;
@@ -78308,7 +78561,7 @@ USE `bs`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `bajasLaborales` AS select `p`.`firstname` AS `firstname`,`p`.`name` AS `name`,`b`.`business_id` AS `business_id`,max(`ce`.`date`) AS `lastDate`,max(ifnull(`b`.`date_end`,util.VN_CURDATE())) AS `endContract`,`at`.`name` AS `type`,cast(count(0) as decimal(10,0)) AS `dias`,`w`.`userFk` AS `userFk` from (((((`postgresql`.`calendar_employee` `ce` join `postgresql`.`business` `b` on((`b`.`business_id` = `ce`.`business_id`))) join `postgresql`.`profile` `pr` on((`pr`.`profile_id` = `b`.`client_id`))) join `postgresql`.`person` `p` on((`p`.`person_id` = `pr`.`person_id`))) join `vn`.`absenceType` `at` on((`at`.`id` = `ce`.`calendar_state_id`))) join `vn`.`worker` `w` on((`w`.`id` = `p`.`id_trabajador`))) where ((`ce`.`date` >= (util.VN_CURDATE() + interval -(1) year)) and (`at`.`name` not in ('Vacaciones','Vacaciones 1/2 día','Compensar','Festivo'))) group by `p`.`firstname`,`p`.`name`,`at`.`name` having (`endContract` >= util.VN_CURDATE()) */;
+/*!50001 VIEW `bajasLaborales` AS select `w`.`firstName` AS `firstname`,`w`.`lastName` AS `name`,`b`.`business_id` AS `business_id`,max(`ce`.`date`) AS `lastDate`,max(ifnull(`b`.`date_end`,curdate())) AS `endContract`,`at`.`name` AS `type`,cast(count(0) as decimal(10,0)) AS `dias`,`w`.`id` AS `userFk` from ((((`postgresql`.`calendar_employee` `ce` join `postgresql`.`business` `b` on((`b`.`business_id` = `ce`.`business_id`))) join `postgresql`.`profile` `pr` on((`pr`.`profile_id` = `b`.`client_id`))) join `vn`.`worker` `w` on((`w`.`id` = `pr`.`workerFk`))) join `vn`.`absenceType` `at` on((`at`.`id` = `ce`.`calendar_state_id`))) where ((`ce`.`date` >= (curdate() + interval -(1) year)) and (`at`.`name` not in ('Vacaciones','Vacaciones 1/2 día','Compensar','Festivo'))) group by `w`.`firstName`,`w`.`lastName`,`at`.`name` having (`endContract` >= curdate()) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78346,7 +78599,7 @@ USE `bs`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `packingSpeed` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) AS `cm3`,`t`.`warehouseFk` AS `warehouse_id`,`e`.`created` AS `odbc_date` from ((`vn`.`expedition` `e` join `vn`.`packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` between util.VN_CURDATE() and `util`.`dayend`(util.VN_CURDATE())) */;
+/*!50001 VIEW `packingSpeed` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) AS `cm3`,`t`.`warehouseFk` AS `warehouse_id`,`e`.`created` AS `odbc_date` from ((`vn`.`expedition` `e` join `vn`.`packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` between curdate() and `util`.`dayend`(curdate())) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78453,7 +78706,7 @@ USE `edi`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `errorList` AS select `po`.`id` AS `id`,`c`.`name` AS `name`,`i`.`longName` AS `longName`,`po`.`quantity` AS `quantity`,left(`po`.`error`,4) AS `stock`,`po`.`error` AS `error`,`po`.`deliveryInformationID` AS `deliveryInformationID`,`po`.`supplyResponseID` AS `supplyResponseID`,`po`.`OrderTradeLineDateTime` AS `OrderTradeLineDateTime`,`po`.`EndUserPartyGLN` AS `EndUserPartyGLN` from ((`edi`.`putOrder` `po` left join `vn`.`client` `c` on((`c`.`id` = `po`.`EndUserPartyGLN`))) left join `vn`.`item` `i` on((`i`.`supplyResponseFk` = `po`.`supplyResponseID`))) where ((`po`.`OrderTradeLineDateTime` > (util.VN_CURDATE() + interval -(12) hour)) and (`po`.`OrderStatus` = 3) and (left(`po`.`error`,4) <> '(0) ')) */;
+/*!50001 VIEW `errorList` AS select `po`.`id` AS `id`,`c`.`name` AS `name`,`i`.`longName` AS `longName`,`po`.`quantity` AS `quantity`,left(`po`.`error`,4) AS `stock`,`po`.`error` AS `error`,`po`.`deliveryInformationID` AS `deliveryInformationID`,`po`.`supplyResponseID` AS `supplyResponseID`,`po`.`OrderTradeLineDateTime` AS `OrderTradeLineDateTime`,`po`.`EndUserPartyGLN` AS `EndUserPartyGLN` from ((`edi`.`putOrder` `po` left join `vn`.`client` `c` on((`c`.`id` = `po`.`EndUserPartyGLN`))) left join `vn`.`item` `i` on((`i`.`supplyResponseFk` = `po`.`supplyResponseID`))) where ((`po`.`OrderTradeLineDateTime` > (curdate() + interval -(12) hour)) and (`po`.`OrderStatus` = 3) and (left(`po`.`error`,4) <> '(0) ')) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -78472,7 +78725,7 @@ USE `edi`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `supplyOffer` AS select `sr`.`vmpID` AS `vmpID`,`di`.`ID` AS `diId`,`sr`.`ID` AS `srId`,`sr`.`Item_ArticleCode` AS `Item_ArticleCode`,`sr`.`VBNOmschrijving` AS `product_name`,`s`.`company_name` AS `company_name`,cast(`sr`.`Price` as decimal(10,3)) AS `Price`,`sr`.`Quality` AS `Quality`,`sr`.`s1` AS `s1`,`sr`.`s2` AS `s2`,`sr`.`s3` AS `s3`,`sr`.`s4` AS `s4`,`sr`.`s5` AS `s5`,`sr`.`s6` AS `s6`,`sr`.`NumberOfUnits` AS `NumberOfUnits`,least(if((`sr`.`EmbalageCode` = 800),((`sr`.`EmbalageCode` * 10) + `sr`.`NumberOfItemsPerCask`),`sr`.`EmbalageCode`),ifnull(`idt`.`bucket_id`,'999')) AS `EmbalageCode`,`di`.`LatestDeliveryDateTime` AS `LatestDeliveryDateTime`,`di`.`EarliestDespatchDateTime` AS `EarliestDespatchDateTime`,`di`.`FirstOrderDateTime` AS `FirstOrderDateTime`,`di`.`LatestOrderDateTime` AS `LatestOrderDateTime`,`sr`.`NumberOfItemsPerCask` AS `NumberOfItemsPerCask`,`sr`.`NumberOfLayersPerTrolley` AS `NumberOfLayersPerTrolley`,`sr`.`MinimumNumberToOrder` AS `MinimumNumberToOrder`,`sr`.`MaximumNumberToOrder` AS `MaximumNumberToOrder`,`sr`.`IncrementalOrderableQuantity` AS `IncrementalOrderableQuantity`,`sr`.`PackingPrice` AS `PackingPrice`,`sr`.`MarketPlaceID` AS `MarketPlaceID`,`sr`.`PictureReference` AS `PictureReference`,`sr`.`updated` AS `supplyResponseUpdated`,`i`.`group_id` AS `group_id`,`mp`.`name` AS `marketPlace`,`di`.`DeliveryPrice` AS `DeliveryPrice`,`di`.`ChargeAmount` AS `ChargeAmount`,`di`.`MinimumQuantity` AS `MinimumQuantity`,`di`.`MaximumQuantity Integer` AS `MaximumQuantity`,cast((`sr`.`MinimumNumberToOrder` * (case `sr`.`MinimumOrderUnitType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `OrderUnit`,cast((`sr`.`IncrementalOrderableQuantity` * (case `sr`.`IncrementalOrderableQuantityType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `IncrementalOrderUnit`,`mp`.`isEarlyBird` AS `isEarlyBird`,`v`.`isVNHSupplier` AS `isVNHSupplier`,`igo`.`expenseFk` AS `expenseFk`,`igo`.`intrastatFk` AS `intrastatFk`,`igo`.`originFk` AS `originFk`,ifnull(`idt`.`itemTypeFk`,`igo`.`itemTypeFk`) AS `itemTypeFk` from (((((((((`edi`.`deliveryInformation` `di` join `edi`.`supplyResponse` `sr` on((`sr`.`ID` = `di`.`supplyResponseID`))) left join `edi`.`supplier` `s` on((`s`.`glnAddressCode` = `sr`.`SupplierGLN`))) join `edi`.`bucket` `b` on((`b`.`bucket_id` = `sr`.`EmbalageCode`))) join `edi`.`item` `i` on((`i`.`id` = `sr`.`Item_ArticleCode`))) join `edi`.`marketPlace` `mp` on((`mp`.`id` = `sr`.`MarketPlaceID`))) join `vn`.`floramondoConfig` `fm`) left join `edi`.`item_defaultType` `idt` on((`idt`.`item_id` = `i`.`id`))) join `edi`.`VMPSettings` `v` on((`v`.`VMPID` = `sr`.`vmpID`))) join `edi`.`item_groupToOffer` `igo` on((`igo`.`group_code` = `i`.`group_id`))) where ((`v`.`isBlocked` = 0) and (`s`.`isBanned` = 0) and (`sr`.`NumberOfUnits` > 0) and (util.VN_NOW() between `di`.`FirstOrderDateTime` and `di`.`LatestOrderDateTime`) and (`mp`.`isOffered` = 1) and (`di`.`LatestDeliveryDateTime` between cast(`fm`.`nextLanded` as date) and concat(cast(`fm`.`nextLanded` as date),' ',`fm`.`MaxLatestDeliveryHour`))) group by `sr`.`ID` having (`EmbalageCode` <> 999) */;
+/*!50001 VIEW `supplyOffer` AS select `sr`.`vmpID` AS `vmpID`,`di`.`ID` AS `diId`,`sr`.`ID` AS `srId`,`sr`.`Item_ArticleCode` AS `Item_ArticleCode`,`sr`.`VBNOmschrijving` AS `product_name`,`s`.`company_name` AS `company_name`,cast(`sr`.`Price` as decimal(10,3)) AS `Price`,`sr`.`Quality` AS `Quality`,`sr`.`s1` AS `s1`,`sr`.`s2` AS `s2`,`sr`.`s3` AS `s3`,`sr`.`s4` AS `s4`,`sr`.`s5` AS `s5`,`sr`.`s6` AS `s6`,`sr`.`NumberOfUnits` AS `NumberOfUnits`,least(if((`sr`.`EmbalageCode` = 800),((`sr`.`EmbalageCode` * 10) + `sr`.`NumberOfItemsPerCask`),`sr`.`EmbalageCode`),ifnull(`idt`.`bucket_id`,'999')) AS `EmbalageCode`,`di`.`LatestDeliveryDateTime` AS `LatestDeliveryDateTime`,`di`.`EarliestDespatchDateTime` AS `EarliestDespatchDateTime`,`di`.`FirstOrderDateTime` AS `FirstOrderDateTime`,`di`.`LatestOrderDateTime` AS `LatestOrderDateTime`,`sr`.`NumberOfItemsPerCask` AS `NumberOfItemsPerCask`,`sr`.`NumberOfLayersPerTrolley` AS `NumberOfLayersPerTrolley`,`sr`.`MinimumNumberToOrder` AS `MinimumNumberToOrder`,`sr`.`MaximumNumberToOrder` AS `MaximumNumberToOrder`,`sr`.`IncrementalOrderableQuantity` AS `IncrementalOrderableQuantity`,`sr`.`PackingPrice` AS `PackingPrice`,`sr`.`MarketPlaceID` AS `MarketPlaceID`,`sr`.`PictureReference` AS `PictureReference`,`sr`.`updated` AS `supplyResponseUpdated`,`i`.`group_id` AS `group_id`,`mp`.`name` AS `marketPlace`,`di`.`DeliveryPrice` AS `DeliveryPrice`,`di`.`ChargeAmount` AS `ChargeAmount`,`di`.`MinimumQuantity` AS `MinimumQuantity`,`di`.`MaximumQuantity Integer` AS `MaximumQuantity`,cast((`sr`.`MinimumNumberToOrder` * (case `sr`.`MinimumOrderUnitType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `OrderUnit`,cast((`sr`.`IncrementalOrderableQuantity` * (case `sr`.`IncrementalOrderableQuantityType` when 1 then 1 when 2 then (`sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask`) when 3 then `sr`.`NumberOfItemsPerCask` when 4 then (floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) when 5 then ((floor(((128 * 56) / (`b`.`x_size` * `b`.`y_size`))) * `sr`.`NumberOfItemsPerCask`) * `sr`.`NumberOfLayersPerTrolley`) end)) as decimal(10,0)) AS `IncrementalOrderUnit`,`mp`.`isEarlyBird` AS `isEarlyBird`,`v`.`isVNHSupplier` AS `isVNHSupplier`,`igo`.`expenseFk` AS `expenseFk`,`igo`.`intrastatFk` AS `intrastatFk`,`igo`.`originFk` AS `originFk`,ifnull(`idt`.`itemTypeFk`,`igo`.`itemTypeFk`) AS `itemTypeFk` from (((((((((`edi`.`deliveryInformation` `di` join `edi`.`supplyResponse` `sr` on((`sr`.`ID` = `di`.`supplyResponseID`))) left join `edi`.`supplier` `s` on((`s`.`glnAddressCode` = `sr`.`SupplierGLN`))) join `edi`.`bucket` `b` on((`b`.`bucket_id` = `sr`.`EmbalageCode`))) join `edi`.`item` `i` on((`i`.`id` = `sr`.`Item_ArticleCode`))) join `edi`.`marketPlace` `mp` on((`mp`.`id` = `sr`.`MarketPlaceID`))) join `vn`.`floramondoConfig` `fm`) left join `edi`.`item_defaultType` `idt` on((`idt`.`item_id` = `i`.`id`))) join `edi`.`VMPSettings` `v` on((`v`.`VMPID` = `sr`.`vmpID`))) join `edi`.`item_groupToOffer` `igo` on((`igo`.`group_code` = `i`.`group_id`))) where ((`v`.`isBlocked` = 0) and (`s`.`isBanned` = 0) and (`sr`.`NumberOfUnits` > 0) and (now() between `di`.`FirstOrderDateTime` and `di`.`LatestOrderDateTime`) and (`mp`.`isOffered` = 1) and (`di`.`LatestDeliveryDateTime` between cast(`fm`.`nextLanded` as date) and concat(cast(`fm`.`nextLanded` as date),' ',`fm`.`MaxLatestDeliveryHour`))) group by `sr`.`ID` having (`EmbalageCode` <> 999) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79002,25 +79255,6 @@ USE `postgresql`;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
---
--- Final view structure for view `person`
---
-
-/*!50001 DROP TABLE IF EXISTS `person`*/;
-/*!50001 DROP VIEW IF EXISTS `person`*/;
-/*!50001 SET @saved_cs_client = @@character_set_client */;
-/*!50001 SET @saved_cs_results = @@character_set_results */;
-/*!50001 SET @saved_col_connection = @@collation_connection */;
-/*!50001 SET character_set_client = utf8mb4 */;
-/*!50001 SET character_set_results = utf8mb4 */;
-/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `person` AS select `p`.`id` AS `person_id`,`p`.`surnames` AS `name`,`p`.`nickname` AS `nickname`,`p`.`fi` AS `nif`,`p`.`birth` AS `birth`,`p`.`firstname` AS `firstname`,`p`.`p2` AS `p2`,`p`.`workerFk` AS `id_trabajador`,`p`.`isDisable` AS `isDisable`,`p`.`isFreelance` AS `isFreelance`,`p`.`isSsDiscounted` AS `isSsDiscounted`,`p`.`sex` AS `sex` from `vn`.`person` `p` */;
-/*!50001 SET character_set_client = @saved_cs_client */;
-/*!50001 SET character_set_results = @saved_cs_results */;
-/*!50001 SET collation_connection = @saved_col_connection */;
-
--
-- Current Database: `sage`
--
@@ -79041,7 +79275,7 @@ USE `sage`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `clientLastTwoMonths` AS select `vn`.`invoiceOut`.`clientFk` AS `clientFk`,`vn`.`invoiceOut`.`companyFk` AS `companyFk` from `vn`.`invoiceOut` where (`vn`.`invoiceOut`.`issued` > (util.VN_CURDATE() - interval 2 month)) union select `vn`.`receipt`.`clientFk` AS `clientFk`,`vn`.`receipt`.`companyFk` AS `companyFk` from `vn`.`receipt` where (`vn`.`receipt`.`payed` > (util.VN_CURDATE() - interval 2 month)) */;
+/*!50001 VIEW `clientLastTwoMonths` AS select `vn`.`invoiceOut`.`clientFk` AS `clientFk`,`vn`.`invoiceOut`.`companyFk` AS `companyFk` from `vn`.`invoiceOut` where (`vn`.`invoiceOut`.`issued` > (curdate() - interval 2 month)) union select `vn`.`receipt`.`clientFk` AS `clientFk`,`vn`.`receipt`.`companyFk` AS `companyFk` from `vn`.`receipt` where (`vn`.`receipt`.`payed` > (curdate() - interval 2 month)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79060,17 +79294,17 @@ USE `sage`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,if((`vn`.`invoiceIn`.`expenceFkDeductible` > 0),1,0) AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` >= (date_format(util.VN_CURDATE(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,`c`.`id` AS `supplierFk`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from (`vn`.`dua` join `vn`.`company` `c` on((`c`.`code` = 'VNL'))) */;
+/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,if((`vn`.`invoiceIn`.`expenceFkDeductible` > 0),1,0) AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` >= (date_format(curdate(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,`c`.`id` AS `supplierFk`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from (`vn`.`dua` join `vn`.`company` `c` on((`c`.`code` = 'VNL'))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
--
--- Final view structure for view `providerLastThreeMonths`
+-- Final view structure for view `supplierLastThreeMonths`
--
-/*!50001 DROP TABLE IF EXISTS `providerLastThreeMonths`*/;
-/*!50001 DROP VIEW IF EXISTS `providerLastThreeMonths`*/;
+/*!50001 DROP TABLE IF EXISTS `supplierLastThreeMonths`*/;
+/*!50001 DROP VIEW IF EXISTS `supplierLastThreeMonths`*/;
/*!50001 SET @saved_cs_client = @@character_set_client */;
/*!50001 SET @saved_cs_results = @@character_set_results */;
/*!50001 SET @saved_col_connection = @@collation_connection */;
@@ -79079,7 +79313,7 @@ USE `sage`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `providerLastThreeMonths` AS select `vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`companyFk` AS `companyFk` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` > (util.VN_CURDATE() - interval 3 month)) union select `vn`.`payment`.`supplierFk` AS `supplierFk`,`vn`.`payment`.`companyFk` AS `companyFk` from `vn`.`payment` where (`vn`.`payment`.`received` > (util.VN_CURDATE() + interval -(3) month)) */;
+/*!50001 VIEW `supplierLastThreeMonths` AS select `vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`companyFk` AS `companyFk` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` > (curdate() - interval 3 month)) union select `vn`.`payment`.`supplierFk` AS `supplierFk`,`vn`.`payment`.`companyFk` AS `companyFk` from `vn`.`payment` where (`vn`.`payment`.`received` > (curdate() + interval -(3) month)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79198,7 +79432,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `NewView` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (util.VN_CURDATE() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (util.VN_CURDATE() + interval -(`notBuyingMonths`) month))) */;
+/*!50001 VIEW `NewView` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (curdate() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (curdate() + interval -(`notBuyingMonths`) month))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79274,7 +79508,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `awbVolume` AS select `d`.`awbFk` AS `awbFk`,(((`b`.`stickers` * `i`.`density`) * if((`p`.`volume` > 0),`p`.`volume`,((`p`.`width` * `p`.`depth`) * if((`p`.`height` = 0),(`i`.`size` + 10),`p`.`height`)))) / 167000) AS `volume`,`b`.`id` AS `buyFk` from (((((((`buy` `b` join `item` `i` on((`b`.`itemFk` = `i`.`id`))) join `itemType` `it` on((`i`.`typeFk` = `it`.`id`))) join `packaging` `p` on((`p`.`id` = `b`.`packageFk`))) join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`t`.`id` = `e`.`travelFk`))) join `duaEntry` `de` on((`de`.`entryFk` = `e`.`id`))) join `dua` `d` on((`d`.`id` = `de`.`duaFk`))) where (`t`.`shipped` > makedate((year(util.VN_CURDATE()) - 1),1)) */;
+/*!50001 VIEW `awbVolume` AS select `d`.`awbFk` AS `awbFk`,(((`b`.`stickers` * `i`.`density`) * if((`p`.`volume` > 0),`p`.`volume`,((`p`.`width` * `p`.`depth`) * if((`p`.`height` = 0),(`i`.`size` + 10),`p`.`height`)))) / 167000) AS `volume`,`b`.`id` AS `buyFk` from (((((((`buy` `b` join `item` `i` on((`b`.`itemFk` = `i`.`id`))) join `itemType` `it` on((`i`.`typeFk` = `it`.`id`))) join `packaging` `p` on((`p`.`id` = `b`.`packageFk`))) join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`t`.`id` = `e`.`travelFk`))) join `duaEntry` `de` on((`de`.`entryFk` = `e`.`id`))) join `dua` `d` on((`d`.`id` = `de`.`duaFk`))) where (`t`.`shipped` > makedate((year(curdate()) - 1),1)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79388,7 +79622,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `clientLost` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (util.VN_CURDATE() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (util.VN_CURDATE() + interval -(`notBuyingMonths`) month))) */;
+/*!50001 VIEW `clientLost` AS select `c`.`id` AS `clientFk`,max(`t`.`shipped`) AS `lastShipped`,`pc`.`notBuyingMonths` AS `notBuyingMonths` from ((`client` `c` join `productionConfig` `pc`) left join `ticket` `t` on(((`c`.`id` = `t`.`clientFk`) and (`t`.`shipped` < (curdate() + interval -(`pc`.`rookieDays`) day))))) group by `c`.`id` having (isnull(`lastShipped`) or (`lastShipped` < (curdate() + interval -(`notBuyingMonths`) month))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79564,25 +79798,6 @@ USE `vn`;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
---
--- Final view structure for view `entryList`
---
-
-/*!50001 DROP TABLE IF EXISTS `entryList`*/;
-/*!50001 DROP VIEW IF EXISTS `entryList`*/;
-/*!50001 SET @saved_cs_client = @@character_set_client */;
-/*!50001 SET @saved_cs_results = @@character_set_results */;
-/*!50001 SET @saved_col_connection = @@collation_connection */;
-/*!50001 SET character_set_client = utf8mb4 */;
-/*!50001 SET character_set_results = utf8mb4 */;
-/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `entryList` AS select `e`.`id` AS `entryFk`,if(`tr`.`isReceived`,' x','') AS `isHere`,`tr`.`landed` AS `landed`,ifnull(`s`.`nickname`,`s`.`name`) AS `supplier`,`e`.`ref` AS `entryRef`,`a`.`name` AS `agency`,`tr`.`ref` AS `travelRef`,`tr`.`appointment` AS `appointment`,`e`.`supplierFk` AS `supplierFk`,`tr`.`warehouseInFk` AS `warehouseInFk` from (((`entry` `e` join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) join `supplier` `s` on((`s`.`id` = `e`.`supplierFk`))) left join `agency` `a` on((`tr`.`agencyFk` = `a`.`id`))) where (`tr`.`landed` between (util.VN_CURDATE() + interval -(1) week) and (util.VN_CURDATE() + interval 3 month)) order by (`tr`.`landed` < (util.VN_CURDATE() + interval 2 day)) desc,`tr`.`landed` desc,ifnull(`s`.`nickname`,`s`.`name`),`e`.`id` desc */;
-/*!50001 SET character_set_client = @saved_cs_client */;
-/*!50001 SET character_set_results = @saved_cs_results */;
-/*!50001 SET collation_connection = @saved_col_connection */;
-
--
-- Final view structure for view `exchangeInsuranceEntry`
--
@@ -79597,7 +79812,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `exchangeInsuranceEntry` AS select max(`tr`.`landed`) AS `dated`,cast(sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) as decimal(10,2)) AS `Dolares`,cast((sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) / sum(((((100 + `e`.`commission`) / 100) * (`b`.`buyingValue` + `b`.`freightValue`)) * `b`.`quantity`))) as decimal(10,4)) AS `rate` from ((`entry` `e` join `buy` `b` on((`e`.`id` = `b`.`entryFk`))) join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) where ((`tr`.`landed` between '2016-01-31' and util.VN_CURDATE()) and (`e`.`commission` < 0) and (`e`.`currencyFk` = 2)) group by month(`tr`.`landed`),year(`tr`.`landed`) */;
+/*!50001 VIEW `exchangeInsuranceEntry` AS select max(`tr`.`landed`) AS `dated`,cast(sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) as decimal(10,2)) AS `Dolares`,cast((sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) / sum(((((100 + `e`.`commission`) / 100) * (`b`.`buyingValue` + `b`.`freightValue`)) * `b`.`quantity`))) as decimal(10,4)) AS `rate` from ((`entry` `e` join `buy` `b` on((`e`.`id` = `b`.`entryFk`))) join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) where ((`tr`.`landed` between '2016-01-31' and curdate()) and (`e`.`commission` < 0) and (`e`.`currencyFk` = 2)) group by month(`tr`.`landed`),year(`tr`.`landed`) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79673,7 +79888,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionCommon` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `etd`,ifnull(ucase(`et`.`description`),'SIN ESCANEAR') AS `description`,`es`.`palletFk` AS `palletFk`,`t`.`routeFk` AS `routeFk`,`es`.`id` AS `scanFk`,`e`.`id` AS `expeditionFk`,`r`.`expeditionTruckFk` AS `expeditionTruckFk`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `lastPacked`,`t`.`id` AS `ticketFk` from (((((`expeditionTruck` `et` left join `routesMonitor` `r` on((`et`.`id` = `r`.`expeditionTruckFk`))) left join `ticket` `t` on((`r`.`routeFk` = `t`.`routeFk`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `expeditionScan` `es` on((`e`.`id` = `es`.`expeditionFk`))) left join `expeditionPallet` `ep` on((`es`.`palletFk` = `ep`.`id`))) where (`et`.`ETD` >= util.VN_CURDATE()) */;
+/*!50001 VIEW `expeditionCommon` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `etd`,ifnull(ucase(`et`.`description`),'SIN ESCANEAR') AS `description`,`es`.`palletFk` AS `palletFk`,`t`.`routeFk` AS `routeFk`,`es`.`id` AS `scanFk`,`e`.`id` AS `expeditionFk`,`r`.`expeditionTruckFk` AS `expeditionTruckFk`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `lastPacked`,`t`.`id` AS `ticketFk` from (((((`expeditionTruck` `et` left join `routesMonitor` `r` on((`et`.`id` = `r`.`expeditionTruckFk`))) left join `ticket` `t` on((`r`.`routeFk` = `t`.`routeFk`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `expeditionScan` `es` on((`e`.`id` = `es`.`expeditionFk`))) left join `expeditionPallet` `ep` on((`es`.`palletFk` = `ep`.`id`))) where (`et`.`ETD` >= curdate()) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79692,7 +79907,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk`,if((`r`.`created` > (util.VN_CURDATE() + interval 1 day)),ucase(dayname(`r`.`created`)),NULL) AS `nombreDia` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */;
+/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk`,if((`r`.`created` > (curdate() + interval 1 day)),ucase(dayname(`r`.`created`)),NULL) AS `nombreDia` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79768,7 +79983,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionSticker` AS select `e`.`id` AS `expeditionFk`,`e`.`ticketFk` AS `ticketFk`,`t`.`addressFk` AS `addressFk`,`t`.`clientFk` AS `clientFk`,`a`.`street` AS `street`,`a`.`postalCode` AS `postalCode`,`a`.`city` AS `city`,`a`.`nickname` AS `nickname`,concat('R(',convert(right(`t`.`routeFk`,3) using utf8mb4),')') AS `routeFk`,`rm`.`beachFk` AS `beachFk`,if(`t`.`routeFk`,replace(`am`.`name`,'ZONA ','Z'),`z`.`name`) AS `zona`,`p`.`name` AS `province`,ifnull(`c`.`mobile`,ifnull(`a`.`mobile`,ifnull(`c`.`phone`,`a`.`phone`))) AS `phone`,`w`.`code` AS `workerCode` from ((((((((((`expedition` `e` join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) left join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) left join `beach` `b` on((`b`.`code` = `rm`.`beachFk`))) left join `zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `agencyMode` `am` on((`am`.`id` = `r`.`agencyModeFk`))) join `client` `c` on((`c`.`id` = `a`.`clientFk`))) join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) */;
+/*!50001 VIEW `expeditionSticker` AS select `e`.`id` AS `expeditionFk`,`e`.`ticketFk` AS `ticketFk`,`t`.`addressFk` AS `addressFk`,`t`.`clientFk` AS `clientFk`,`a`.`street` AS `street`,`a`.`postalCode` AS `postalCode`,`a`.`city` AS `city`,`a`.`nickname` AS `nickname`,concat('R(',convert(right(`t`.`routeFk`,3) using utf8mb4),')') AS `routeFk`,`rm`.`beachFk` AS `beachFk`,if(`t`.`routeFk`,ifnull(`et`.`description`,replace(`am`.`name`,'ZONA ','Z')),`z`.`name`) AS `zona`,`p`.`name` AS `province`,ifnull(`c`.`mobile`,ifnull(`a`.`mobile`,ifnull(`c`.`phone`,`a`.`phone`))) AS `phone`,`w`.`code` AS `workerCode` from (((((((((((`expedition` `e` join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) left join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) left join `expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) left join `beach` `b` on((`b`.`code` = `rm`.`beachFk`))) left join `zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `agencyMode` `am` on((`am`.`id` = `r`.`agencyModeFk`))) join `client` `c` on((`c`.`id` = `a`.`clientFk`))) join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79787,7 +80002,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTicket_NoBoxes` AS select `t`.`id` AS `ticketFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`routeFk` AS `routeFk`,`et`.`description` AS `description` from (((`ticket` `t` left join `expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) join `expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) where (isnull(`e`.`id`) and (`et`.`ETD` > util.VN_CURDATE())) */;
+/*!50001 VIEW `expeditionTicket_NoBoxes` AS select `t`.`id` AS `ticketFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`routeFk` AS `routeFk`,`et`.`description` AS `description` from (((`ticket` `t` left join `expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) join `routesMonitor` `rm` on((`rm`.`routeFk` = `t`.`routeFk`))) join `expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) where (isnull(`e`.`id`) and (`et`.`ETD` > curdate())) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79806,7 +80021,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTimeExpended` AS select `e`.`ticketFk` AS `ticketFk`,min(`e`.`created`) AS `started`,max(`e`.`created`) AS `finished`,max(`e`.`counter`) AS `cajas`,`w`.`code` AS `code`,`t`.`warehouseFk` AS `warehouseFk` from ((`expedition` `e` join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` > util.VN_CURDATE()) group by `e`.`ticketFk` */;
+/*!50001 VIEW `expeditionTimeExpended` AS select `e`.`ticketFk` AS `ticketFk`,min(`e`.`created`) AS `started`,max(`e`.`created`) AS `finished`,max(`e`.`counter`) AS `cajas`,`w`.`code` AS `code`,`t`.`warehouseFk` AS `warehouseFk` from ((`expedition` `e` join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` > curdate()) group by `e`.`ticketFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -79939,7 +80154,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceCorrectionDataSource` AS select `s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped` from (`sale` `s` join `ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) where (`t`.`shipped` > (util.VN_CURDATE() + interval -(3) year)) */;
+/*!50001 VIEW `invoiceCorrectionDataSource` AS select `s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped` from (`sale` `s` join `ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) where (`t`.`shipped` > (curdate() + interval -(3) year)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80072,7 +80287,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) where (`ips`.`created` >= util.VN_CURDATE()) group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
+/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) where (`ips`.`created` >= curdate()) group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80129,7 +80344,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(util.VN_CURDATE())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`isPreviousPreparable`) */;
+/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`isPreviousPreparable`) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80376,7 +80591,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastHourProduction` AS select `t`.`warehouseFk` AS `warehouseFk`,cast(sum((ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) / 1000000)) as decimal(5,1)) AS `m3` from (((`warehouse` `w` join `ticket` `t` on((`t`.`warehouseFk` = `w`.`id`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) where (`e`.`created` between (util.VN_NOW() - interval 1 hour) and util.VN_NOW()) group by `t`.`warehouseFk` */;
+/*!50001 VIEW `lastHourProduction` AS select `t`.`warehouseFk` AS `warehouseFk`,cast(sum((ifnull(`p`.`volume`,((`p`.`width` * `p`.`height`) * `p`.`depth`)) / 1000000)) as decimal(5,1)) AS `m3` from (((`warehouse` `w` join `ticket` `t` on((`t`.`warehouseFk` = `w`.`id`))) left join `expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `packaging` `p` on((`p`.`id` = `e`.`packagingFk`))) where (`e`.`created` between (now() - interval 1 hour) and now()) group by `t`.`warehouseFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80414,7 +80629,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (util.VN_CURDATE() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimsNumber` desc */;
+/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (curdate() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimsNumber` desc */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80528,7 +80743,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `personMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on((`po`.`person_id` = `p`.`person_id`))) join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil personal') */;
+/*!50001 VIEW `personMedia` AS select `po`.`workerFk` AS `workerFk`,`m`.`value` AS `mediaValue` from (((`postgresql`.`profile` `po` join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil personal') */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80566,7 +80781,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `productionVolume` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,ifnull(((`p`.`width` * `p`.`height`) * `p`.`depth`),94500)) AS `cm3`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `created` from (((`expedition` `e` left join `packaging` `p` on((`p`.`itemFk` = `e`.`itemFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `client` `c` on((`c`.`id` = `t`.`clientFk`))) where ((`e`.`created` between util.VN_CURDATE() and `util`.`dayend`(util.VN_CURDATE())) and `c`.`isRelevant`) */;
+/*!50001 VIEW `productionVolume` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,ifnull(((`p`.`width` * `p`.`height`) * `p`.`depth`),94500)) AS `cm3`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `created` from (((`expedition` `e` left join `packaging` `p` on((`p`.`itemFk` = `e`.`itemFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `client` `c` on((`c`.`id` = `t`.`clientFk`))) where ((`e`.`created` between curdate() and `util`.`dayend`(curdate())) and `c`.`isRelevant`) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80585,7 +80800,26 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `productionVolume_LastHour` AS select cast(sum((`productionVolume`.`cm3` / 1000000)) as decimal(10,0)) AS `m3`,`productionVolume`.`warehouseFk` AS `warehouseFk` from `productionVolume` where ((`productionVolume`.`created` > (util.VN_NOW() + interval -(1) hour)) and (`productionVolume`.`warehouseFk` in (1,44,60))) group by `productionVolume`.`warehouseFk` */;
+/*!50001 VIEW `productionVolume_LastHour` AS select cast(sum((`productionVolume`.`cm3` / 1000000)) as decimal(10,0)) AS `m3`,`productionVolume`.`warehouseFk` AS `warehouseFk` from `productionVolume` where ((`productionVolume`.`created` > (now() + interval -(1) hour)) and (`productionVolume`.`warehouseFk` in (1,44,60))) group by `productionVolume`.`warehouseFk` */;
+/*!50001 SET character_set_client = @saved_cs_client */;
+/*!50001 SET character_set_results = @saved_cs_results */;
+/*!50001 SET collation_connection = @saved_col_connection */;
+
+--
+-- Final view structure for view `returnBuckets`
+--
+
+/*!50001 DROP TABLE IF EXISTS `returnBuckets`*/;
+/*!50001 DROP VIEW IF EXISTS `returnBuckets`*/;
+/*!50001 SET @saved_cs_client = @@character_set_client */;
+/*!50001 SET @saved_cs_results = @@character_set_results */;
+/*!50001 SET @saved_col_connection = @@collation_connection */;
+/*!50001 SET character_set_client = utf8mb4 */;
+/*!50001 SET character_set_results = utf8mb4 */;
+/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `returnBuckets` AS select `cr`.`idCubos_Retorno` AS `id`,`cr`.`Soporte` AS `freightContainerType`,`cr`.`Vacio` AS `freightPackagingEmpty`,`cr`.`Lleno` AS `freightPackagingFull` from `vn2008`.`Cubos_Retorno` `cr` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80718,7 +80952,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleSaleTracking` AS select distinct `st`.`saleFk` AS `saleFk` from `saleTracking` `st` where (`st`.`created` >= (util.VN_CURDATE() + interval -(1) day)) */;
+/*!50001 VIEW `saleSaleTracking` AS select distinct `st`.`saleFk` AS `saleFk` from `saleTracking` `st` where (`st`.`created` >= (curdate() + interval -(1) day)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80775,7 +81009,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleVolume_Today_VNH` AS select `t`.`nickname` AS `Cliente`,`p`.`name` AS `Provincia`,`c`.`country` AS `Pais`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `volume` from (((((`saleVolume` `sv` join `ticket` `t` on((`t`.`id` = `sv`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) join `country` `c` on((`c`.`id` = `p`.`countryFk`))) join `warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) where ((`w`.`name` = 'VNH') and (`t`.`shipped` between util.VN_CURDATE() and `util`.`dayend`(util.VN_CURDATE()))) group by `t`.`nickname`,`p`.`name` */;
+/*!50001 VIEW `saleVolume_Today_VNH` AS select `t`.`nickname` AS `Cliente`,`p`.`name` AS `Provincia`,`c`.`country` AS `Pais`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `volume` from (((((`saleVolume` `sv` join `ticket` `t` on((`t`.`id` = `sv`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) join `country` `c` on((`c`.`id` = `p`.`countryFk`))) join `warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) where ((`w`.`name` = 'VNH') and (`t`.`shipped` between curdate() and `util`.`dayend`(curdate()))) group by `t`.`nickname`,`p`.`name` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80813,7 +81047,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPersonSince` AS select `p`.`id_trabajador` AS `workerFk`,min(`b`.`date_start`) AS `started` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) left join `postgresql`.`business` `b` on((`pr`.`profile_id` = `b`.`client_id`))) left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `postgresql`.`professional_category` `pc` on((`pc`.`professional_category_id` = `bl`.`professional_category_id`))) where (`pc`.`category_name` = 'Aux ventas') group by `p`.`id_trabajador` */;
+/*!50001 VIEW `salesPersonSince` AS select `pr`.`workerFk` AS `workerFk`,min(`b`.`date_start`) AS `started` from (((`postgresql`.`profile` `pr` left join `postgresql`.`business` `b` on((`pr`.`profile_id` = `b`.`client_id`))) left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `postgresql`.`professional_category` `pc` on((`pc`.`professional_category_id` = `bl`.`professional_category_id`))) where (`pc`.`category_name` = 'Aux ventas') group by `pr`.`workerFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80832,7 +81066,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPreparedLastHour` AS select `t`.`warehouseFk` AS `warehouseFk`,`st`.`saleFk` AS `saleFk`,`st`.`isChecked` AS `isChecked`,`st`.`originalQuantity` AS `originalQuantity`,`a`.`accion` AS `accion`,`st`.`created` AS `created`,`e`.`code` AS `code`,`w`.`firstName` AS `firstname`,`w`.`lastName` AS `lastName`,`w`.`code` AS `workerCode`,((`ic`.`cm3delivery` * `s`.`quantity`) / 1000) AS `litros`,`s`.`concept` AS `concept`,`d`.`name` AS `departmentName` from (((((((((`vn`.`saleTracking` `st` left join `vn`.`salesPreviousPreparated` `prevPrepSales` on((`prevPrepSales`.`saleFk` = `st`.`saleFk`))) join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`itemCost` `ic` on(((`ic`.`warehouseFk` = `t`.`warehouseFk`) and (`ic`.`itemFk` = `s`.`itemFk`)))) join `vn`.`worker` `w` on((`w`.`id` = `st`.`workerFk`))) join `vn`.`state` `e` on((`e`.`id` = `st`.`stateFk`))) join `vncontrol`.`accion` `a` on((`a`.`accion_id` = `st`.`actionFk`))) join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `st`.`workerFk`))) join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) where ((`st`.`created` > (util.VN_NOW() + interval -(1) hour)) and isnull(`prevPrepSales`.`saleFk`) and (not((`d`.`name` like 'EQUIPO%')))) */;
+/*!50001 VIEW `salesPreparedLastHour` AS select `t`.`warehouseFk` AS `warehouseFk`,`st`.`saleFk` AS `saleFk`,`st`.`isChecked` AS `isChecked`,`st`.`originalQuantity` AS `originalQuantity`,`a`.`accion` AS `accion`,`st`.`created` AS `created`,`e`.`code` AS `code`,`w`.`firstName` AS `firstname`,`w`.`lastName` AS `lastName`,`w`.`code` AS `workerCode`,((`ic`.`cm3delivery` * `s`.`quantity`) / 1000) AS `litros`,`s`.`concept` AS `concept`,`d`.`name` AS `departmentName` from (((((((((`vn`.`saleTracking` `st` left join `vn`.`salesPreviousPreparated` `prevPrepSales` on((`prevPrepSales`.`saleFk` = `st`.`saleFk`))) join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`itemCost` `ic` on(((`ic`.`warehouseFk` = `t`.`warehouseFk`) and (`ic`.`itemFk` = `s`.`itemFk`)))) join `vn`.`worker` `w` on((`w`.`id` = `st`.`workerFk`))) join `vn`.`state` `e` on((`e`.`id` = `st`.`stateFk`))) join `vncontrol`.`accion` `a` on((`a`.`accion_id` = `st`.`actionFk`))) join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `st`.`workerFk`))) join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) where ((`st`.`created` > (now() + interval -(1) hour)) and isnull(`prevPrepSales`.`saleFk`) and (not((`d`.`name` like 'EQUIPO%')))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80851,7 +81085,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPreviousPreparated` AS select `st`.`saleFk` AS `saleFk` from (`saleTracking` `st` join `state` `e` on((`e`.`id` = `st`.`stateFk`))) where ((`st`.`created` > util.VN_CURDATE()) and (`e`.`code` like 'PREVIOUS_PREPARATION')) */;
+/*!50001 VIEW `salesPreviousPreparated` AS select `st`.`saleFk` AS `saleFk` from (`saleTracking` `st` join `state` `e` on((`e`.`id` = `st`.`stateFk`))) where ((`st`.`created` > curdate()) and (`e`.`code` like 'PREVIOUS_PREPARATION')) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -80927,7 +81161,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketLastUpdatedList` AS select `s`.`ticketFk` AS `ticketFk`,`st`.`created` AS `created` from (`vn`.`saleTracking` `st` join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) where (`st`.`created` > util.VN_CURDATE()) union all select `i`.`Id_Ticket` AS `Id_Ticket`,`i`.`odbc_date` AS `odbc_date` from `vncontrol`.`inter` `i` where (`i`.`odbc_date` > util.VN_CURDATE()) union all select `s`.`ticketFk` AS `ticketFk`,`iss`.`created` AS `created` from (`vn`.`itemShelvingSale` `iss` join `vn`.`sale` `s` on((`s`.`id` = `iss`.`saleFk`))) where (`iss`.`created` > util.VN_CURDATE()) */;
+/*!50001 VIEW `ticketLastUpdatedList` AS select `s`.`ticketFk` AS `ticketFk`,`st`.`created` AS `created` from (`vn`.`saleTracking` `st` join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) where (`st`.`created` > curdate()) union all select `i`.`Id_Ticket` AS `Id_Ticket`,`i`.`odbc_date` AS `odbc_date` from `vncontrol`.`inter` `i` where (`i`.`odbc_date` > curdate()) union all select `s`.`ticketFk` AS `ticketFk`,`iss`.`created` AS `created` from (`vn`.`itemShelvingSale` `iss` join `vn`.`sale` `s` on((`s`.`id` = `iss`.`saleFk`))) where (`iss`.`created` > curdate()) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81022,7 +81256,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketPreviousPreparingList` AS select `s`.`ticketFk` AS `ticketFk`,`w`.`code` AS `code`,count(`s`.`id`) AS `saleLines`,sum((`s`.`isPicked` <> 0)) AS `alreadyMadeSaleLines`,(sum((`s`.`isPicked` <> 0)) / count(`s`.`id`)) AS `madeRate`,`sg`.`created` AS `created`,`p`.`code` AS `parking`,`iss`.`sectorFk` AS `sectorFk`,`al`.`code` AS `alertCode` from (((((((`vn`.`saleGroup` `sg` join `vn`.`saleGroupDetail` `sgd` on((`sgd`.`saleGroupFk` = `sg`.`id`))) join `vn`.`sale` `s` on((`s`.`id` = `sgd`.`saleFk`))) join `vn`.`ticketState` `tls` on((`tls`.`ticketFk` = `s`.`ticketFk`))) join `vn`.`alertLevel` `al` on((`al`.`id` = `tls`.`alertLevel`))) join `vn`.`worker` `w` on((`w`.`id` = `sg`.`userFk`))) left join `vn`.`parking` `p` on((`p`.`id` = `sg`.`parkingFk`))) join `vn`.`itemShelvingStock` `iss` on((`iss`.`itemFk` = `s`.`itemFk`))) where (`sg`.`created` >= (util.VN_CURDATE() + interval 0.1 day)) group by `sg`.`id` */;
+/*!50001 VIEW `ticketPreviousPreparingList` AS select `s`.`ticketFk` AS `ticketFk`,`w`.`code` AS `code`,count(`s`.`id`) AS `saleLines`,sum((`s`.`isPicked` <> 0)) AS `alreadyMadeSaleLines`,(sum((`s`.`isPicked` <> 0)) / count(`s`.`id`)) AS `madeRate`,`sg`.`created` AS `created`,`p`.`code` AS `parking`,`iss`.`sectorFk` AS `sectorFk`,`al`.`code` AS `alertCode` from (((((((`vn`.`saleGroup` `sg` join `vn`.`saleGroupDetail` `sgd` on((`sgd`.`saleGroupFk` = `sg`.`id`))) join `vn`.`sale` `s` on((`s`.`id` = `sgd`.`saleFk`))) join `vn`.`ticketState` `tls` on((`tls`.`ticketFk` = `s`.`ticketFk`))) join `vn`.`alertLevel` `al` on((`al`.`id` = `tls`.`alertLevel`))) join `vn`.`worker` `w` on((`w`.`id` = `sg`.`userFk`))) left join `vn`.`parking` `p` on((`p`.`id` = `sg`.`parkingFk`))) join `vn`.`itemShelvingStock` `iss` on((`iss`.`itemFk` = `s`.`itemFk`))) where (`sg`.`created` >= (curdate() + interval 0.1 day)) group by `sg`.`id` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81060,7 +81294,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`vn`.`ticketState` `ts` join `vn`.`ticket` `t` on((`t`.`id` = `ts`.`ticket`))) where (`t`.`shipped` between util.VN_CURDATE() and `MIDNIGHT`(util.VN_CURDATE())) */;
+/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`vn`.`ticketState` `ts` join `vn`.`ticket` `t` on((`t`.`id` = `ts`.`ticket`))) where (`t`.`shipped` between curdate() and `MIDNIGHT`(curdate())) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81098,7 +81332,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `tr2` AS select `travel`.`id` AS `id`,`travel`.`shipped` AS `shipped`,`travel`.`shipmentHour` AS `shipmentHour`,`travel`.`landed` AS `landed`,`travel`.`landingHour` AS `landingHour`,`travel`.`warehouseInFk` AS `warehouseInFk`,`travel`.`warehouseOutFk` AS `warehouseOutFk`,`travel`.`agencyFk` AS `agencyFk`,`travel`.`ref` AS `ref`,`travel`.`isDelivered` AS `isDelivered`,`travel`.`isReceived` AS `isReceived`,`travel`.`m3` AS `m3`,`travel`.`kg` AS `kg`,`travel`.`cargoSupplierFk` AS `cargoSupplierFk`,`travel`.`totalEntries` AS `totalEntries` from `travel` */;
+/*!50001 VIEW `tr2` AS select `travel`.`id` AS `id`,`travel`.`shipped` AS `shipped`,`travel`.`shipmentHour` AS `shipmentHour`,`travel`.`landed` AS `landed`,`travel`.`landingHour` AS `landingHour`,`travel`.`warehouseInFk` AS `warehouseInFk`,`travel`.`warehouseOutFk` AS `warehouseOutFk`,`travel`.`agencyModeFk` AS `agencyFk`,`travel`.`ref` AS `ref`,`travel`.`isDelivered` AS `isDelivered`,`travel`.`isReceived` AS `isReceived`,`travel`.`m3` AS `m3`,`travel`.`kg` AS `kg`,`travel`.`cargoSupplierFk` AS `cargoSupplierFk`,`travel`.`totalEntries` AS `totalEntries` from `travel` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81174,7 +81408,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerBusinessDated` AS select `t`.`dated` AS `dated`,`b`.`business_id` AS `business_id`,`w`.`id` AS `workerFk` from ((((`vn`.`time` `t` left join `postgresql`.`business` `b` on((`t`.`dated` between `b`.`date_start` and ifnull(`b`.`date_end`,util.VN_CURDATE())))) left join `postgresql`.`profile` `pr` on((`b`.`client_id` = `pr`.`profile_id`))) left join `postgresql`.`person` `p` on((`pr`.`person_id` = `p`.`person_id`))) left join `vn`.`worker` `w` on((`p`.`id_trabajador` = `w`.`id`))) where (`t`.`dated` > (util.VN_CURDATE() + interval -(2) year)) */;
+/*!50001 VIEW `workerBusinessDated` AS select `t`.`dated` AS `dated`,`b`.`business_id` AS `business_id`,`pr`.`workerFk` AS `workerFk` from ((`vn`.`time` `t` left join `postgresql`.`business` `b` on((`t`.`dated` between `b`.`date_start` and ifnull(`b`.`date_end`,curdate())))) left join `postgresql`.`profile` `pr` on((`b`.`client_id` = `pr`.`profile_id`))) where (`t`.`dated` > (curdate() + interval -(2) year)) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81193,7 +81427,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerCalendar` AS select `ce`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`ce`.`calendar_state_id` AS `absenceTypeFk`,`ce`.`date` AS `dated` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`calendar_employee` `ce` on((`ce`.`business_id` = `b`.`business_id`))) */;
+/*!50001 VIEW `workerCalendar` AS select `ce`.`business_id` AS `businessFk`,`pr`.`workerFk` AS `workerFk`,`ce`.`calendar_state_id` AS `absenceTypeFk`,`ce`.`date` AS `dated` from ((`postgresql`.`profile` `pr` join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`calendar_employee` `ce` on((`ce`.`business_id` = `b`.`business_id`))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81212,26 +81446,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerDepartment` AS select `p`.`id_trabajador` AS `workerFk`,`d`.`id` AS `departmentFk` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) left join (`postgresql`.`business` `b` left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) on((`pr`.`profile_id` = `b`.`client_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) where ((isnull(`b`.`date_end`) and (`b`.`date_start` <= util.VN_CURDATE())) or ((`b`.`date_end` >= util.VN_CURDATE()) and (`b`.`date_start` <= util.VN_CURDATE()))) */;
-/*!50001 SET character_set_client = @saved_cs_client */;
-/*!50001 SET character_set_results = @saved_cs_results */;
-/*!50001 SET collation_connection = @saved_col_connection */;
-
---
--- Final view structure for view `workerDepartmentTest`
---
-
-/*!50001 DROP TABLE IF EXISTS `workerDepartmentTest`*/;
-/*!50001 DROP VIEW IF EXISTS `workerDepartmentTest`*/;
-/*!50001 SET @saved_cs_client = @@character_set_client */;
-/*!50001 SET @saved_cs_results = @@character_set_results */;
-/*!50001 SET @saved_col_connection = @@collation_connection */;
-/*!50001 SET character_set_client = utf8mb4 */;
-/*!50001 SET character_set_results = utf8mb4 */;
-/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerDepartmentTest` AS select `p`.`workerFk` AS `workerFk`,`d`.`id` AS `departmentFk` from ((((`vn`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) where (util.VN_CURDATE() between `b`.`date_start` and ifnull(`b`.`date_end`,util.VN_CURDATE())) */;
+/*!50001 VIEW `workerDepartment` AS select `pr`.`workerFk` AS `workerFk`,`bl`.`department_id` AS `departmentFk` from (`postgresql`.`profile` `pr` left join (`postgresql`.`business` `b` left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) on((`pr`.`profile_id` = `b`.`client_id`))) where ((isnull(`b`.`date_end`) and (`b`.`date_start` <= curdate())) or ((`b`.`date_end` >= curdate()) and (`b`.`date_start` <= curdate()))) */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81250,7 +81465,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerLabour` AS select `b`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`bl`.`workcenter_id` AS `workCenterFk`,`b`.`date_start` AS `started`,`b`.`date_end` AS `ended`,`d`.`id` AS `departmentFk`,`b`.`payedHolidays` AS `payedHolidays` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) order by `b`.`date_start` desc */;
+/*!50001 VIEW `workerLabour` AS select `b`.`business_id` AS `businessFk`,`pr`.`workerFk` AS `workerFk`,`bl`.`workcenter_id` AS `workCenterFk`,`b`.`date_start` AS `started`,`b`.`date_end` AS `ended`,`d`.`id` AS `departmentFk`,`b`.`payedHolidays` AS `payedHolidays` from (((`postgresql`.`profile` `pr` join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) order by `b`.`date_start` desc */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81269,7 +81484,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on((`po`.`person_id` = `p`.`person_id`))) join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil empresa') */;
+/*!50001 VIEW `workerMedia` AS select `po`.`workerFk` AS `workerFk`,`m`.`value` AS `mediaValue` from (((`postgresql`.`profile` `po` join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil empresa') */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81288,7 +81503,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerSpeedExpedition` AS select `sv`.`ticketFk` AS `ticketFk`,sum(`sv`.`litros`) AS `litros`,sum(if((`sub`.`started` > (util.VN_NOW() + interval -(1) hour)),`sv`.`litros`,0)) AS `literLastHour`,cast(((60 * sum(`sv`.`litros`)) / time_to_sec(timediff(max(`sub`.`finished`),min(`sub`.`started`)))) as decimal(10,1)) AS `litersByMinute`,`sub`.`code` AS `workerCode`,`sub`.`cajas` AS `cajas`,`sub`.`warehouseFk` AS `warehouseFk` from (`saleVolume` `sv` join `expeditionTimeExpended` `sub` on((`sub`.`ticketFk` = `sv`.`ticketFk`))) group by `workerCode` */;
+/*!50001 VIEW `workerSpeedExpedition` AS select `sv`.`ticketFk` AS `ticketFk`,sum(`sv`.`litros`) AS `litros`,sum(if((`sub`.`started` > (now() + interval -(1) hour)),`sv`.`litros`,0)) AS `literLastHour`,cast(((60 * sum(`sv`.`litros`)) / time_to_sec(timediff(max(`sub`.`finished`),min(`sub`.`started`)))) as decimal(10,1)) AS `litersByMinute`,`sub`.`code` AS `workerCode`,`sub`.`cajas` AS `cajas`,`sub`.`warehouseFk` AS `warehouseFk` from (`saleVolume` `sv` join `expeditionTimeExpended` `sub` on((`sub`.`ticketFk` = `sv`.`ticketFk`))) group by `workerCode` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81307,7 +81522,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerSpeedSaleTracking` AS select `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`,`salesPreparedLastHour`.`accion` AS `accion`,`salesPreparedLastHour`.`workerCode` AS `workerCode`,sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`,min(`salesPreparedLastHour`.`created`) AS `started`,max(`salesPreparedLastHour`.`created`) AS `finished`,sum(if((`salesPreparedLastHour`.`created` >= (util.VN_NOW() + interval -(1) hour)),`salesPreparedLastHour`.`litros`,0)) AS `sumaLitrosLastHour`,cast(((60 * sum(`salesPreparedLastHour`.`litros`)) / time_to_sec(timediff(max(`salesPreparedLastHour`.`created`),min(`salesPreparedLastHour`.`created`)))) as decimal(10,1)) AS `litersByMinute`,`salesPreparedLastHour`.`departmentName` AS `departmentName` from `vn`.`salesPreparedLastHour` group by `salesPreparedLastHour`.`warehouseFk`,`salesPreparedLastHour`.`accion`,`salesPreparedLastHour`.`workerCode` */;
+/*!50001 VIEW `workerSpeedSaleTracking` AS select `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`,`salesPreparedLastHour`.`accion` AS `accion`,`salesPreparedLastHour`.`workerCode` AS `workerCode`,sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`,min(`salesPreparedLastHour`.`created`) AS `started`,max(`salesPreparedLastHour`.`created`) AS `finished`,sum(if((`salesPreparedLastHour`.`created` >= (now() + interval -(1) hour)),`salesPreparedLastHour`.`litros`,0)) AS `sumaLitrosLastHour`,cast(((60 * sum(`salesPreparedLastHour`.`litros`)) / time_to_sec(timediff(max(`salesPreparedLastHour`.`created`),min(`salesPreparedLastHour`.`created`)))) as decimal(10,1)) AS `litersByMinute`,`salesPreparedLastHour`.`departmentName` AS `departmentName` from `vn`.`salesPreparedLastHour` group by `salesPreparedLastHour`.`warehouseFk`,`salesPreparedLastHour`.`accion`,`salesPreparedLastHour`.`workerCode` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81364,7 +81579,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeControlWorking` AS select `wtc`.`userFk` AS `userFk`,`wtc`.`timed` AS `timed`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`pm`.`mediaValue` AS `phone`,`wm`.`mediaValue` AS `workerPhone`,`d`.`name` AS `department`,`wc`.`name` AS `workerCenter`,count(`wtc`.`order`) AS `maxOrder` from (((((((`vn`.`workerTimeControl` `wtc` join `vn`.`worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) left join `vn`.`personMedia` `pm` on((`pm`.`workerFk` = `w`.`id`))) left join `vn`.`workerMedia` `wm` on((`wm`.`workerFk` = `w`.`id`))) left join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `w`.`id`))) left join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) left join `vn`.`workerLabour` `wl` on((`wl`.`businessFk` = (select `wl2`.`businessFk` from `vn`.`workerLabour` `wl2` where (`wl2`.`workerFk` = `w`.`id`) order by `wl2`.`started` desc limit 1)))) left join `vn`.`workCenter` `wc` on((`wc`.`id` = `wl`.`workCenterFk`))) where (cast(`wtc`.`timed` as date) = util.VN_CURDATE()) group by `wtc`.`userFk` having ((`maxOrder` % 2) = 1) order by `wtc`.`timed` desc */;
+/*!50001 VIEW `workerTimeControlWorking` AS select `wtc`.`userFk` AS `userFk`,`wtc`.`timed` AS `timed`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`pm`.`mediaValue` AS `phone`,`wm`.`mediaValue` AS `workerPhone`,`d`.`name` AS `department`,`wc`.`name` AS `workerCenter`,count(`wtc`.`order`) AS `maxOrder` from (((((((`vn`.`workerTimeControl` `wtc` join `vn`.`worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) left join `vn`.`personMedia` `pm` on((`pm`.`workerFk` = `w`.`id`))) left join `vn`.`workerMedia` `wm` on((`wm`.`workerFk` = `w`.`id`))) left join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `w`.`id`))) left join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) left join `vn`.`workerLabour` `wl` on((`wl`.`businessFk` = (select `wl2`.`businessFk` from `vn`.`workerLabour` `wl2` where (`wl2`.`workerFk` = `w`.`id`) order by `wl2`.`started` desc limit 1)))) left join `vn`.`workCenter` `wc` on((`wc`.`id` = `wl`.`workCenterFk`))) where (cast(`wtc`.`timed` as date) = curdate()) group by `wtc`.`userFk` having ((`maxOrder` % 2) = 1) order by `wtc`.`timed` desc */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81402,7 +81617,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerWithoutTractor` AS select `c`.`workerFk` AS `workerFk`,`cl`.`name` AS `Trabajador`,count(distinct `c`.`id`) AS `Colecciones`,max(`c`.`created`) AS `created` from ((`collection` `c` join `client` `cl` on((`cl`.`id` = `c`.`workerFk`))) left join `machineWorker` `mw` on(((`mw`.`workerFk` = `c`.`workerFk`) and (`mw`.`inTimed` > util.VN_CURDATE())))) where ((`c`.`created` > util.VN_CURDATE()) and isnull(`mw`.`workerFk`)) group by `c`.`workerFk` */;
+/*!50001 VIEW `workerWithoutTractor` AS select `c`.`workerFk` AS `workerFk`,`cl`.`name` AS `Trabajador`,count(distinct `c`.`id`) AS `Colecciones`,max(`c`.`created`) AS `created` from ((`collection` `c` join `client` `cl` on((`cl`.`id` = `c`.`workerFk`))) left join `machineWorker` `mw` on(((`mw`.`workerFk` = `c`.`workerFk`) and (`mw`.`inTimed` > curdate())))) where ((`c`.`created` > curdate()) and isnull(`mw`.`workerFk`)) group by `c`.`workerFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81421,7 +81636,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
-/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,cast((util.VN_CURDATE() + interval ((hour(ifnull(`zc`.`hour`,`z`.`hour`)) * 60) + minute(ifnull(`zc`.`hour`,`z`.`hour`))) minute) as time) AS `hourTheoretical`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `totalVolume`,cast(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0)) as decimal(5,1)) AS `remainingVolume`,greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) AS `speed`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `hourEffective`,floor(((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)))) AS `minutesLess`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `etc` from (((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `s` on((`s`.`id` = `tst`.`state`))) join `vn`.`saleVolume` `sv` on((`sv`.`ticketFk` = `t`.`id`))) left join `vn`.`lastHourProduction` `lhp` on((`lhp`.`warehouseFk` = `t`.`warehouseFk`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`warehouseAlias` `wa` on((`wa`.`id` = `w`.`aliasFk`))) join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`zoneClosure` `zc` on(((`zc`.`zoneFk` = `t`.`zoneFk`) and (`zc`.`dated` = util.VN_CURDATE())))) left join `cache`.`departure_limit` `dl` on(((`dl`.`warehouse_id` = `t`.`warehouseFk`) and (`dl`.`fecha` = util.VN_CURDATE())))) where (`w`.`hasProduction` and (cast(`t`.`shipped` as date) = util.VN_CURDATE())) group by `t`.`zoneFk` */;
+/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,cast((curdate() + interval ((hour(ifnull(`zc`.`hour`,`z`.`hour`)) * 60) + minute(ifnull(`zc`.`hour`,`z`.`hour`))) minute) as time) AS `hourTheoretical`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `totalVolume`,cast(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0)) as decimal(5,1)) AS `remainingVolume`,greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) AS `speed`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `hourEffective`,floor(((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)))) AS `minutesLess`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `etc` from (((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `s` on((`s`.`id` = `tst`.`state`))) join `vn`.`saleVolume` `sv` on((`sv`.`ticketFk` = `t`.`id`))) left join `vn`.`lastHourProduction` `lhp` on((`lhp`.`warehouseFk` = `t`.`warehouseFk`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`warehouseAlias` `wa` on((`wa`.`id` = `w`.`aliasFk`))) join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`zoneClosure` `zc` on(((`zc`.`zoneFk` = `t`.`zoneFk`) and (`zc`.`dated` = curdate())))) left join `cache`.`departure_limit` `dl` on(((`dl`.`warehouse_id` = `t`.`warehouseFk`) and (`dl`.`fecha` = curdate())))) where (`w`.`hasProduction` and (cast(`t`.`shipped` as date) = curdate())) group by `t`.`zoneFk` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -81441,4 +81656,4 @@ USE `vncontrol`;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-06-23 12:12:10
+-- Dump completed on 2022-08-03 9:39:55
diff --git a/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js b/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
index e2f842a15..1c4d53266 100644
--- a/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
+++ b/loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
@@ -24,6 +24,6 @@ describe('Model rewriteDbError()', () => {
error = e;
}
- expect(error.message).toEqual(`The tag can't be repeated`);
+ expect(error.message).toEqual(`The tag or priority can't be repeated for an item`);
});
});
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 38ac2d86c..07a00024a 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -44,7 +44,7 @@
"is not a valid date": "No es una fecha valida",
"Barcode must be unique": "El código de barras debe ser único",
"The warehouse can't be repeated": "El almacén no puede repetirse",
- "The tag can't be repeated": "El tag no puede repetirse",
+ "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
"The observation type can't be repeated": "El tipo de observación no puede repetirse",
"A claim with that sale already exists": "Ya existe una reclamación para esta línea",
"You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
diff --git a/modules/account/back/models/role-config.js b/modules/account/back/models/role-config.js
index 6051f2060..ba7bf9d52 100644
--- a/modules/account/back/models/role-config.js
+++ b/modules/account/back/models/role-config.js
@@ -56,6 +56,12 @@ module.exports = Self => {
if (!userExists) {
await Self.rawSql('CREATE USER ?@? IDENTIFIED BY ?',
[mysqlUser, this.userHost, password]);
+ await Self.rawSql(
+ `UPDATE mysql.global_priv
+ SET Priv = JSON_SET(Priv, '$.autogenerated' , TRUE)
+ WHERE User = ? AND Host = ?`,
+ [mysqlUser, this.userHost]
+ );
userExists = true;
} else {
switch (this.dbType) {
diff --git a/modules/item/back/models/item-tag.js b/modules/item/back/models/item-tag.js
index 891d11558..5b7163913 100644
--- a/modules/item/back/models/item-tag.js
+++ b/modules/item/back/models/item-tag.js
@@ -5,7 +5,7 @@ module.exports = Self => {
Self.rewriteDbError(function(err) {
if (err.code === 'ER_DUP_ENTRY')
- return new UserError(`The tag can't be repeated`);
+ return new UserError(`The tag or priority can't be repeated for an item`);
if (err.code === 'ER_BAD_NULL_ERROR')
return new UserError(`Tag value cannot be blank`);
return err;
diff --git a/modules/mdb/back/methods/mdbVersion/upload.js b/modules/mdb/back/methods/mdbVersion/upload.js
index 3d54c0250..57df35ce7 100644
--- a/modules/mdb/back/methods/mdbVersion/upload.js
+++ b/modules/mdb/back/methods/mdbVersion/upload.js
@@ -88,17 +88,19 @@ module.exports = Self => {
await fs.mkdir(branchPath, {recursive: true});
const destinationBranch = path.join(branchPath, `${appName}.7z`);
- const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+ const destinationRelative = `../../.archive/${appName}/${newVersion}.7z`;
try {
await fs.unlink(destinationBranch);
} catch (e) {}
- await fs.symlink(destinationFile, destinationBranch);
+ await fs.symlink(destinationRelative, destinationBranch);
if (branch == 'master') {
+ const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+ const rootRelative = `./.archive/${appName}/${newVersion}.7z`;
try {
await fs.unlink(destinationRoot);
} catch (e) {}
- await fs.symlink(destinationFile, destinationRoot);
+ await fs.symlink(rootRelative, destinationRoot);
}
}
diff --git a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
index 3d07b90f9..e1fdeb0c5 100644
--- a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
+++ b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
-describe('ticket listPackaging()', () => {
+// 4376
+xdescribe('ticket listPackaging()', () => {
it('should return the packaging', async() => {
const tx = await models.Packaging.beginTransaction({});
@@ -8,9 +9,9 @@ describe('ticket listPackaging()', () => {
const options = {transaction: tx};
const filter = {where: {packagingFk: 1}};
- const response = await models.Packaging.listPackaging(filter, options);
+ const [response] = await models.Packaging.listPackaging(filter, options);
- expect(response[0].name).toEqual('Container ammo box 1m');
+ expect(response.name).toEqual('Container ammo box 1m');
await tx.rollback();
} catch (e) {
diff --git a/modules/worker/back/methods/department/specs/removeChild.spec.js b/modules/worker/back/methods/department/specs/removeChild.spec.js
index 03216ac13..b769bcaa6 100644
--- a/modules/worker/back/methods/department/specs/removeChild.spec.js
+++ b/modules/worker/back/methods/department/specs/removeChild.spec.js
@@ -8,7 +8,7 @@ describe('department removeChild()', () => {
});
it('should remove a child department', async() => {
- const childId = 130;
+ const childId = 44;
removedChild = await app.models.Department.findById(childId);
const result = await app.models.Department.removeChild(childId);
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index b3a3fce16..430ec7dfc 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -88,9 +88,8 @@ module.exports = Self => {
FROM vn.calendar c
JOIN postgresql.business b ON b.business_id = c.businessFk
JOIN postgresql.profile p ON p.profile_id = b.client_id
- JOIN vn.person pe ON pe.id = p.person_id
WHERE c.dayOffTypeFk = 6
- AND pe.workerFk = ?
+ AND p.workerFk = ?
AND c.dated BETWEEN util.firstDayOfYear(?)
AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
diff --git a/print/templates/reports/item-label/locale/es.yml b/print/templates/reports/item-label/locale/es.yml
new file mode 100644
index 000000000..278946f3e
--- /dev/null
+++ b/print/templates/reports/item-label/locale/es.yml
@@ -0,0 +1 @@
+reportName: Etiqueta
\ No newline at end of file