8144-devToTest_2448 #3216
|
|
@ -3057,9 +3057,6 @@ INSERT INTO `vn`.`workerTimeControlMail` (`id`, `workerFk`, `year`, `week`, `sta
|
||||||
(3, 9, 2000, 51, 'CONFIRMED', util.VN_NOW(), 1, NULL),
|
(3, 9, 2000, 51, 'CONFIRMED', util.VN_NOW(), 1, NULL),
|
||||||
(4, 9, 2001, 1, 'SENDED', util.VN_NOW(), 1, NULL);
|
(4, 9, 2001, 1, 'SENDED', util.VN_NOW(), 1, NULL);
|
||||||
|
|
||||||
INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `maxWagonHeight`, `minHeightBetweenTrays`, `maxTrays`)
|
|
||||||
VALUES
|
|
||||||
(1, 1350, 1900, 200, 50, 6);
|
|
||||||
|
|
||||||
INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`)
|
INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`)
|
||||||
VALUES
|
VALUES
|
||||||
|
|
@ -3068,15 +3065,19 @@ INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`)
|
||||||
(3, 'green', '#00ff00'),
|
(3, 'green', '#00ff00'),
|
||||||
(4, 'blue', '#0000ff');
|
(4, 'blue', '#0000ff');
|
||||||
|
|
||||||
|
INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `maxWagonHeight`, `minHeightBetweenTrays`, `maxTrays`, `defaultTrayColorFk`)
|
||||||
|
VALUES
|
||||||
|
(1, 1350, 1900, 200, 50, 6, 1);
|
||||||
|
|
||||||
INSERT INTO `vn`.`wagonType` (`id`, `name`, `divisible`)
|
INSERT INTO `vn`.`wagonType` (`id`, `name`, `divisible`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Wagon Type #1', 1);
|
(1, 'Wagon Type #1', 1);
|
||||||
|
|
||||||
INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
|
INSERT INTO `vn`.`wagonTypeTray` (`id`, `wagonTypeFk`, `height`, `wagonTypeColorFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 1, 100, 1),
|
(1, 1, 0, 1),
|
||||||
(2, 1, 50, 2),
|
(2, 1, 50, 2),
|
||||||
(3, 1, 0, 3);
|
(3, 1, 100, 3);
|
||||||
|
|
||||||
INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`)
|
INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`)
|
||||||
VALUES
|
VALUES
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `edi`.`floramondo`
|
|
||||||
ON SCHEDULE EVERY 6 MINUTE
|
|
||||||
STARTS '2022-01-28 09:52:45.000'
|
|
||||||
ON COMPLETION NOT PRESERVE
|
|
||||||
DISABLE
|
|
||||||
DO CALL edi.floramondo_offerRefresh()$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,522 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`floramondo_offerRefresh`()
|
|
||||||
proc: BEGIN
|
|
||||||
DECLARE vLanded DATETIME;
|
|
||||||
DECLARE vDone INT DEFAULT FALSE;
|
|
||||||
DECLARE vFreeId INT;
|
|
||||||
DECLARE vSupplyResponseFk INT;
|
|
||||||
DECLARE vLastInserted DATETIME;
|
|
||||||
DECLARE vIsAuctionDay BOOLEAN;
|
|
||||||
DECLARE vMaxNewItems INT DEFAULT 10000;
|
|
||||||
DECLARE vStartingTime DATETIME;
|
|
||||||
DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
|
|
||||||
DECLARE vDayRange INT;
|
|
||||||
|
|
||||||
DECLARE cur1 CURSOR FOR
|
|
||||||
SELECT id
|
|
||||||
FROM edi.item_free;
|
|
||||||
|
|
||||||
DECLARE cur2 CURSOR FOR
|
|
||||||
SELECT srId
|
|
||||||
FROM itemToInsert;
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
|
||||||
DECLARE EXIT HANDLER FOR SQLSTATE '45000'
|
|
||||||
BEGIN
|
|
||||||
ROLLBACK;
|
|
||||||
RESIGNAL;
|
|
||||||
END;
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
|
|
||||||
BEGIN
|
|
||||||
DO RELEASE_LOCK('edi.floramondo_offerRefresh');
|
|
||||||
SET @isTriggerDisabled = FALSE;
|
|
||||||
RESIGNAL;
|
|
||||||
END;
|
|
||||||
|
|
||||||
IF 'test' = (SELECT environment FROM util.config) THEN
|
|
||||||
LEAVE proc;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN
|
|
||||||
LEAVE proc;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT dayRange INTO vDayRange
|
|
||||||
FROM offerRefreshConfig;
|
|
||||||
|
|
||||||
IF vDayRange IS NULL THEN
|
|
||||||
CALL util.throw("Variable vDayRange not declared");
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SET vStartingTime = util.VN_NOW();
|
|
||||||
|
|
||||||
TRUNCATE edi.offerList;
|
|
||||||
|
|
||||||
INSERT INTO edi.offerList(supplier, total)
|
|
||||||
SELECT v.name, COUNT(DISTINCT sr.ID) total
|
|
||||||
FROM edi.supplyResponse sr
|
|
||||||
JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
|
|
||||||
WHERE sr.NumberOfUnits > 0
|
|
||||||
AND sr.EmbalageCode != 999
|
|
||||||
GROUP BY sr.vmpID;
|
|
||||||
|
|
||||||
UPDATE edi.offerList o
|
|
||||||
JOIN (SELECT v.name, COUNT(*) total
|
|
||||||
FROM edi.supplyOffer sr
|
|
||||||
JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
|
|
||||||
GROUP BY sr.vmpID) sub ON o.supplier = sub.name
|
|
||||||
SET o.`filter` = sub.total;
|
|
||||||
|
|
||||||
-- Elimina de la lista de items libres aquellos que ya existen
|
|
||||||
DELETE itf.*
|
|
||||||
FROM edi.item_free itf
|
|
||||||
JOIN vn.item i ON i.id = itf.id;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp
|
|
||||||
(INDEX (`Item_ArticleCode`))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT t.*
|
|
||||||
FROM (
|
|
||||||
SELECT *
|
|
||||||
FROM edi.supplyOffer
|
|
||||||
ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC,
|
|
||||||
NumberOfUnits DESC LIMIT 10000000000000000000) t
|
|
||||||
GROUP BY t.srId;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
|
|
||||||
INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`),
|
|
||||||
INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT so.*,
|
|
||||||
ev1.type_description s1Value,
|
|
||||||
ev2.type_description s2Value,
|
|
||||||
ev3.type_description s3Value,
|
|
||||||
ev4.type_description s4Value,
|
|
||||||
ev5.type_description s5Value,
|
|
||||||
ev6.type_description s6Value,
|
|
||||||
eif1.feature ef1,
|
|
||||||
eif2.feature ef2,
|
|
||||||
eif3.feature ef3,
|
|
||||||
eif4.feature ef4,
|
|
||||||
eif5.feature ef5,
|
|
||||||
eif6.feature ef6
|
|
||||||
FROM tmp so
|
|
||||||
LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
|
|
||||||
AND eif1.presentation_order = 1
|
|
||||||
AND eif1.expiry_date IS NULL
|
|
||||||
LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
|
|
||||||
AND eif2.presentation_order = 2
|
|
||||||
AND eif2.expiry_date IS NULL
|
|
||||||
LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
|
|
||||||
AND eif3.presentation_order = 3
|
|
||||||
AND eif3.expiry_date IS NULL
|
|
||||||
LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
|
|
||||||
AND eif4.presentation_order = 4
|
|
||||||
AND eif4.expiry_date IS NULL
|
|
||||||
LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
|
|
||||||
AND eif5.presentation_order = 5
|
|
||||||
AND eif5.expiry_date IS NULL
|
|
||||||
LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
|
|
||||||
AND eif6.presentation_order = 6
|
|
||||||
AND eif6.expiry_date IS NULL
|
|
||||||
LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature
|
|
||||||
AND so.s1 = ev1.type_value
|
|
||||||
LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature
|
|
||||||
AND so.s2 = ev2.type_value
|
|
||||||
LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature
|
|
||||||
AND so.s3 = ev3.type_value
|
|
||||||
LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature
|
|
||||||
AND so.s4 = ev4.type_value
|
|
||||||
LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature
|
|
||||||
AND so.s5 = ev5.type_value
|
|
||||||
LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature
|
|
||||||
AND so.s6 = ev6.type_value
|
|
||||||
ORDER BY Price;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tmp;
|
|
||||||
|
|
||||||
DELETE o
|
|
||||||
FROM edi.offer o
|
|
||||||
LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size'
|
|
||||||
LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size'
|
|
||||||
LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size'
|
|
||||||
LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size'
|
|
||||||
LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size'
|
|
||||||
LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size'
|
|
||||||
JOIN vn.floramondoConfig fc ON TRUE
|
|
||||||
WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize)
|
|
||||||
OR (t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize)
|
|
||||||
OR (t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize)
|
|
||||||
OR (t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize)
|
|
||||||
OR (t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
|
|
||||||
OR (t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
|
|
||||||
|
|
||||||
START TRANSACTION;
|
|
||||||
|
|
||||||
-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
|
|
||||||
UPDATE IGNORE edi.offer o
|
|
||||||
JOIN vn.item i
|
|
||||||
ON i.name = o.product_name
|
|
||||||
AND i.subname <=> o.company_name
|
|
||||||
AND i.value5 <=> o.s1Value
|
|
||||||
AND i.value6 <=> o.s2Value
|
|
||||||
AND i.value7 <=> o.s3Value
|
|
||||||
AND i.value8 <=> o.s4Value
|
|
||||||
AND i.value9 <=> o.s5Value
|
|
||||||
AND i.value10 <=> o.s6Value
|
|
||||||
AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
|
|
||||||
AND i.EmbalageCode <=> o.EmbalageCode
|
|
||||||
AND i.quality <=> o.Quality
|
|
||||||
JOIN vn.itemType it ON it.id = i.typeFk
|
|
||||||
LEFT JOIN vn.sale s ON s.itemFk = i.id
|
|
||||||
LEFT JOIN vn.ticket t ON t.id = s.ticketFk
|
|
||||||
AND t.shipped > (util.VN_CURDATE() - INTERVAL 1 WEEK)
|
|
||||||
LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
|
|
||||||
LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
|
|
||||||
LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk
|
|
||||||
AND po.OrderTradeLineDateTime > (util.VN_CURDATE() - INTERVAL 1 WEEK)
|
|
||||||
SET i.supplyResponseFk = o.srID
|
|
||||||
WHERE (sr.ID IS NULL
|
|
||||||
OR sr.NumberOfUnits = 0
|
|
||||||
OR di.LatestOrderDateTime < util.VN_NOW()
|
|
||||||
OR di.ID IS NULL)
|
|
||||||
AND it.isInventory
|
|
||||||
AND t.id IS NULL
|
|
||||||
AND po.id IS NULL;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE itemToInsert
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT o.*, CAST(NULL AS DECIMAL(6,0)) itemFk
|
|
||||||
FROM edi.offer o
|
|
||||||
LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
|
|
||||||
WHERE i.id IS NULL
|
|
||||||
LIMIT vMaxNewItems;
|
|
||||||
|
|
||||||
-- Reciclado de nº de item
|
|
||||||
OPEN cur1;
|
|
||||||
OPEN cur2;
|
|
||||||
|
|
||||||
read_loop: LOOP
|
|
||||||
|
|
||||||
FETCH cur2 INTO vSupplyResponseFk;
|
|
||||||
FETCH cur1 INTO vFreeId;
|
|
||||||
|
|
||||||
IF vDone THEN
|
|
||||||
LEAVE read_loop;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
UPDATE itemToInsert
|
|
||||||
SET itemFk = vFreeId
|
|
||||||
WHERE srId = vSupplyResponseFk;
|
|
||||||
|
|
||||||
END LOOP;
|
|
||||||
|
|
||||||
CLOSE cur1;
|
|
||||||
CLOSE cur2;
|
|
||||||
|
|
||||||
-- Insertamos todos los items en Articles de la oferta
|
|
||||||
INSERT INTO vn.item(id,
|
|
||||||
`name`,
|
|
||||||
longName,
|
|
||||||
subName,
|
|
||||||
expenseFk,
|
|
||||||
typeFk,
|
|
||||||
intrastatFk,
|
|
||||||
originFk,
|
|
||||||
supplyResponseFk,
|
|
||||||
numberOfItemsPerCask,
|
|
||||||
embalageCode,
|
|
||||||
quality,
|
|
||||||
isFloramondo)
|
|
||||||
SELECT iti.itemFk,
|
|
||||||
iti.product_name,
|
|
||||||
iti.product_name,
|
|
||||||
iti.company_name,
|
|
||||||
iti.expenseFk,
|
|
||||||
iti.itemTypeFk,
|
|
||||||
iti.intrastatFk,
|
|
||||||
iti.originFk,
|
|
||||||
iti.`srId`,
|
|
||||||
iti.NumberOfItemsPerCask,
|
|
||||||
iti.EmbalageCode,
|
|
||||||
iti.Quality,
|
|
||||||
TRUE
|
|
||||||
FROM itemToInsert iti;
|
|
||||||
|
|
||||||
-- Inserta la foto de los articulos nuevos (prioridad alta)
|
|
||||||
INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
|
|
||||||
SELECT i.id, PictureReference
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.srId
|
|
||||||
WHERE PictureReference IS NOT NULL
|
|
||||||
AND i.image IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO edi.`log`(tableName, fieldName,fieldValue)
|
|
||||||
SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
|
|
||||||
FROM vn.itemImageQueue
|
|
||||||
WHERE attempts = 0;
|
|
||||||
|
|
||||||
-- Inserta si se añadiesen tags nuevos
|
|
||||||
INSERT IGNORE INTO vn.tag (name, ediTypeFk)
|
|
||||||
SELECT description, type_id FROM edi.type;
|
|
||||||
|
|
||||||
-- Desabilita el trigger para recalcular los tags al final
|
|
||||||
SET @isTriggerDisabled = TRUE;
|
|
||||||
|
|
||||||
-- Inserta los tags sólo en los articulos nuevos
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , ii.product_name, 1
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.`name` = 'Producto'
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT ii.product_name IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , ii.Quality, 3
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.`name` = 'Calidad'
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT ii.Quality IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , ii.company_name, 4
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.`name` = 'Productor'
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT ii.company_name IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , s1Value, 5
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.ediTypeFk = ii.ef1
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT s1Value IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , s2Value, 6
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.ediTypeFk = ii.ef2
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT s2Value IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , s3Value, 7
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.ediTypeFk = ii.ef3
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT s3Value IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , s4Value, 8
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.ediTypeFk = ii.ef4
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT s4Value IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , s5Value, 9
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.ediTypeFk = ii.ef5
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT s5Value IS NULL;
|
|
||||||
|
|
||||||
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id , s6Value, 10
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.tag t ON t.ediTypeFk = ii.ef6
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
WHERE NOT s6Value IS NULL;
|
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority)
|
|
||||||
SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11
|
|
||||||
FROM itemToInsert ii
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
|
|
||||||
JOIN vn.tag t ON t.`name` = 'Color'
|
|
||||||
LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
|
|
||||||
LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id
|
|
||||||
AND tp.`description` = 'Hoofdkleur 1'
|
|
||||||
LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
|
|
||||||
LEFT JOIN vn.itemInk ik ON ik.longName = i.longName
|
|
||||||
WHERE ink.name IS NOT NULL
|
|
||||||
OR ik.color IS NOT NULL;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TABLE tmp.item
|
|
||||||
(PRIMARY KEY (id))
|
|
||||||
SELECT i.id FROM vn.item i
|
|
||||||
JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
|
|
||||||
|
|
||||||
CALL vn.item_refreshTags();
|
|
||||||
|
|
||||||
DROP TABLE tmp.item;
|
|
||||||
|
|
||||||
SELECT MIN(LatestDeliveryDateTime) INTO vLanded
|
|
||||||
FROM edi.supplyResponse sr
|
|
||||||
JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
|
|
||||||
JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
|
|
||||||
JOIN vn.floramondoConfig fc
|
|
||||||
WHERE mp.isLatestOrderDateTimeRelevant
|
|
||||||
AND di.LatestOrderDateTime > IF(
|
|
||||||
fc.MaxLatestOrderHour > HOUR(util.VN_NOW()),
|
|
||||||
util.VN_CURDATE(),
|
|
||||||
util.VN_CURDATE() + INTERVAL 1 DAY);
|
|
||||||
|
|
||||||
UPDATE vn.floramondoConfig
|
|
||||||
SET nextLanded = vLanded
|
|
||||||
WHERE vLanded IS NOT NULL;
|
|
||||||
|
|
||||||
-- Elimina la oferta obsoleta
|
|
||||||
UPDATE vn.buy b
|
|
||||||
JOIN vn.entry e ON e.id = b.entryFk
|
|
||||||
JOIN vn.travel tr ON tr.id = e.travelFk
|
|
||||||
JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
|
|
||||||
JOIN vn.item i ON i.id = b.itemFk
|
|
||||||
LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
|
|
||||||
LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
|
|
||||||
SET b.quantity = 0
|
|
||||||
WHERE (IFNULL(di.LatestOrderDateTime,util.VN_NOW()) <= util.VN_NOW()
|
|
||||||
OR i.supplyResponseFk IS NULL
|
|
||||||
OR sr.NumberOfUnits = 0)
|
|
||||||
AND am.name = 'LOGIFLORA'
|
|
||||||
AND e.isRaid;
|
|
||||||
|
|
||||||
-- Localiza las entradas de cada almacen
|
|
||||||
UPDATE edi.warehouseFloramondo
|
|
||||||
SET entryFk = vn.entry_getForLogiflora(vLanded + INTERVAL travellingDays DAY, warehouseFk);
|
|
||||||
|
|
||||||
IF vLanded IS NOT NULL THEN
|
|
||||||
-- Actualiza la oferta existente
|
|
||||||
UPDATE vn.buy b
|
|
||||||
JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
|
|
||||||
JOIN vn.item i ON i.id = b.itemFk
|
|
||||||
JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
|
|
||||||
SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
|
|
||||||
b.buyingValue = o.price
|
|
||||||
WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask
|
|
||||||
OR b.buyingValue <> o.price);
|
|
||||||
|
|
||||||
-- Inserta el resto
|
|
||||||
SET vLastInserted := util.VN_NOW();
|
|
||||||
|
|
||||||
-- Inserta la oferta
|
|
||||||
INSERT INTO vn.buy (
|
|
||||||
entryFk,
|
|
||||||
itemFk,
|
|
||||||
quantity,
|
|
||||||
buyingValue,
|
|
||||||
stickers,
|
|
||||||
packing,
|
|
||||||
`grouping`,
|
|
||||||
groupingMode,
|
|
||||||
packagingFk,
|
|
||||||
deliveryFk)
|
|
||||||
SELECT wf.entryFk,
|
|
||||||
i.id,
|
|
||||||
o.NumberOfUnits * o.NumberOfItemsPerCask quantity,
|
|
||||||
o.Price,
|
|
||||||
o.NumberOfUnits etiquetas,
|
|
||||||
o.NumberOfItemsPerCask packing,
|
|
||||||
GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
|
|
||||||
'packing',
|
|
||||||
o.embalageCode,
|
|
||||||
o.diId
|
|
||||||
FROM edi.offer o
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = o.srId
|
|
||||||
JOIN edi.warehouseFloramondo wf
|
|
||||||
JOIN vn.packaging p ON p.id
|
|
||||||
LIKE o.embalageCode
|
|
||||||
LEFT JOIN vn.buy b ON b.itemFk = i.id
|
|
||||||
AND b.entryFk = wf.entryFk
|
|
||||||
WHERE b.id IS NULL; -- Quitar esta linea y mirar de crear los packages a tiempo REAL
|
|
||||||
|
|
||||||
INSERT INTO vn.itemCost(
|
|
||||||
itemFk,
|
|
||||||
warehouseFk,
|
|
||||||
cm3,
|
|
||||||
cm3delivery)
|
|
||||||
SELECT b.itemFk,
|
|
||||||
wf.warehouseFk,
|
|
||||||
@cm3 := vn.buy_getUnitVolume(b.id),
|
|
||||||
IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3)
|
|
||||||
FROM warehouseFloramondo wf
|
|
||||||
JOIN vn.volumeConfig vc
|
|
||||||
JOIN vn.buy b ON b.entryFk = wf.entryFk
|
|
||||||
JOIN vn.item i ON i.id = b.itemFk
|
|
||||||
LEFT JOIN vn.itemCost ic ON ic.itemFk = b.itemFk
|
|
||||||
AND ic.warehouseFk = wf.warehouseFk
|
|
||||||
WHERE (ic.cm3 IS NULL OR ic.cm3 = 0)
|
|
||||||
ON DUPLICATE KEY UPDATE cm3 = @cm3, cm3delivery = IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3);
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc
|
|
||||||
SELECT b.id
|
|
||||||
FROM vn.buy b
|
|
||||||
JOIN warehouseFloramondo wf ON wf.entryFk = b.entryFk
|
|
||||||
WHERE b.created >= vLastInserted;
|
|
||||||
|
|
||||||
CALL vn.buy_recalcPrices();
|
|
||||||
|
|
||||||
UPDATE edi.offerList o
|
|
||||||
JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
|
|
||||||
FROM vn.buy b
|
|
||||||
JOIN vn.item i ON i.id = b.itemFk
|
|
||||||
JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
|
|
||||||
JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
|
|
||||||
JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
|
|
||||||
JOIN vn.warehouse w ON w.id = wf.warehouseFk
|
|
||||||
WHERE w.name = 'VNH'
|
|
||||||
AND b.quantity > 0
|
|
||||||
GROUP BY sr.vmpID) sub ON o.supplier = sub.name
|
|
||||||
SET o.vnh = sub.total;
|
|
||||||
|
|
||||||
UPDATE edi.offerList o
|
|
||||||
JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
|
|
||||||
FROM vn.buy b
|
|
||||||
JOIN vn.item i ON i.id = b.itemFk
|
|
||||||
JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
|
|
||||||
JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
|
|
||||||
JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
|
|
||||||
JOIN vn.warehouse w ON w.id = wf.warehouseFk
|
|
||||||
WHERE w.name = 'ALGEMESI'
|
|
||||||
AND b.quantity > 0
|
|
||||||
GROUP BY sr.vmpID) sub ON o.supplier = sub.name
|
|
||||||
SET o.algemesi = sub.total;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE
|
|
||||||
edi.offer,
|
|
||||||
itemToInsert;
|
|
||||||
|
|
||||||
SET @isTriggerDisabled = FALSE;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
|
|
||||||
UPDATE vn.item i
|
|
||||||
SET typeFk = 121
|
|
||||||
WHERE i.longName LIKE 'Rosa Garden %'
|
|
||||||
AND typeFk = 17;
|
|
||||||
|
|
||||||
UPDATE vn.item i
|
|
||||||
SET typeFk = 156
|
|
||||||
WHERE i.longName LIKE 'Rosa ec %'
|
|
||||||
AND typeFk = 17;
|
|
||||||
|
|
||||||
-- Refresca las fotos de los items existentes que mostramos (prioridad baja)
|
|
||||||
INSERT IGNORE INTO vn.itemImageQueue(itemFk, url, priority)
|
|
||||||
SELECT i.id, sr.PictureReference, 100
|
|
||||||
FROM edi.supplyResponse sr
|
|
||||||
JOIN vn.item i ON i.supplyResponseFk = sr.ID
|
|
||||||
JOIN edi.supplyOffer so ON so.srId = sr.ID
|
|
||||||
JOIN hedera.image i2 ON i2.name = i.image
|
|
||||||
AND i2.collectionFk = 'catalog'
|
|
||||||
WHERE i2.updated <= (UNIX_TIMESTAMP(util.VN_NOW()) - vDayRange)
|
|
||||||
AND sr.NumberOfUnits;
|
|
||||||
|
|
||||||
INSERT INTO edi.`log`
|
|
||||||
SET tableName = 'floramondo_offerRefresh',
|
|
||||||
fieldName = 'Tiempo de proceso',
|
|
||||||
fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime);
|
|
||||||
|
|
||||||
DO RELEASE_LOCK('edi.floramondo_offerRefresh');
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getForLogiflora`(vLanded DATE, vWarehouseFk INT)
|
|
||||||
RETURNS int(11)
|
|
||||||
NOT DETERMINISTIC
|
|
||||||
READS SQL DATA
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Devuelve una entrada para Logiflora. Si no existe la crea.
|
|
||||||
*
|
|
||||||
* @param vLanded Fecha de llegada al almacén
|
|
||||||
* @param vWarehouseFk Identificador de vn.warehouse
|
|
||||||
*/
|
|
||||||
|
|
||||||
DECLARE vTravelFk INT;
|
|
||||||
DECLARE vEntryFk INT;
|
|
||||||
DECLARE previousEntryFk INT;
|
|
||||||
|
|
||||||
SET vTravelFk = vn.travel_getForLogiflora(vLanded, vWarehouseFk);
|
|
||||||
|
|
||||||
IF vLanded THEN
|
|
||||||
|
|
||||||
SELECT IFNULL(MAX(id),0) INTO vEntryFk
|
|
||||||
FROM vn.entry
|
|
||||||
WHERE travelFk = vTravelFk
|
|
||||||
AND isRaid;
|
|
||||||
|
|
||||||
IF NOT vEntryFk THEN
|
|
||||||
|
|
||||||
INSERT INTO vn.entry(travelFk, supplierFk, commission, companyFk, currencyFk, isRaid)
|
|
||||||
SELECT vTravelFk, s.id, 4, c.id, cu.id, TRUE
|
|
||||||
FROM vn.supplier s
|
|
||||||
JOIN vn.company c ON c.code = 'VNL'
|
|
||||||
JOIN vn.currency cu ON cu.code = 'EUR'
|
|
||||||
WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
|
|
||||||
|
|
||||||
SELECT MAX(id) INTO vEntryFk
|
|
||||||
FROM vn.entry
|
|
||||||
WHERE travelFk = vTravelFk;
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT entryFk INTO previousEntryFk
|
|
||||||
FROM edi.warehouseFloramondo wf
|
|
||||||
WHERE wf.warehouseFk = vWarehouseFk;
|
|
||||||
|
|
||||||
IF IFNULL(previousEntryFk,0) != vEntryFk THEN
|
|
||||||
|
|
||||||
UPDATE buy b
|
|
||||||
SET b.printedStickers = 0
|
|
||||||
WHERE entryFk = previousEntryFk;
|
|
||||||
|
|
||||||
DELETE FROM buy WHERE entryFk = previousEntryFk;
|
|
||||||
|
|
||||||
DELETE FROM entry WHERE id = previousEntryFk;
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
RETURN vEntryFk;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`travel_getForLogiflora`(vLanded DATE, vWarehouseFk INT)
|
|
||||||
RETURNS int(11)
|
|
||||||
NOT DETERMINISTIC
|
|
||||||
READS SQL DATA
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Devuelve un número de travel para compras de Logiflora a partir de la fecha de llegada y del almacén.
|
|
||||||
* Si no existe lo genera.
|
|
||||||
*
|
|
||||||
* @param vLanded Fecha de llegada al almacén
|
|
||||||
* @param vWarehouseFk Identificador de vn.warehouse
|
|
||||||
*/
|
|
||||||
|
|
||||||
DECLARE vTravelFk INT;
|
|
||||||
|
|
||||||
IF vLanded THEN
|
|
||||||
|
|
||||||
SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk
|
|
||||||
FROM vn.travel tr
|
|
||||||
JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
|
|
||||||
JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
|
|
||||||
JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
|
|
||||||
WHERE wIn.id = vWarehouseFk
|
|
||||||
AND wOut.name = 'Holanda'
|
|
||||||
AND am.name = 'LOGIFLORA'
|
|
||||||
AND landed = vLanded;
|
|
||||||
|
|
||||||
IF NOT vTravelFk THEN
|
|
||||||
|
|
||||||
INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
|
|
||||||
SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id
|
|
||||||
FROM vn.warehouse wOut
|
|
||||||
JOIN vn.agencyMode am ON am.name = 'LOGIFLORA'
|
|
||||||
WHERE wOut.name = 'Holanda';
|
|
||||||
|
|
||||||
SELECT MAX(tr.id) INTO vTravelFk
|
|
||||||
FROM vn.travel tr
|
|
||||||
JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
|
|
||||||
JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
|
|
||||||
WHERE wIn.id = vWarehouseFk
|
|
||||||
AND wOut.name = 'Holanda'
|
|
||||||
AND landed = vLanded;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
RETURN vTravelFk;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -167,7 +167,8 @@ BEGIN
|
||||||
OR LENGTH(pb.problem)
|
OR LENGTH(pb.problem)
|
||||||
OR pb.lines > vLinesLimit
|
OR pb.lines > vLinesLimit
|
||||||
OR pb.m3 > vVolumeLimit
|
OR pb.m3 > vVolumeLimit
|
||||||
OR sub.maxSize > vSizeLimit;
|
OR sub.maxSize > vSizeLimit
|
||||||
|
OR pb.hasPlantTray;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede
|
-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ BEGIN
|
||||||
SELECT * FROM (
|
SELECT * FROM (
|
||||||
SELECT cc.client clientFk, ci.grade
|
SELECT cc.client clientFk, ci.grade
|
||||||
FROM creditClassification cc
|
FROM creditClassification cc
|
||||||
JOIN creditInsurance ci ON cc.id = ci.creditClassification
|
JOIN creditInsurance ci ON cc.id = ci.creditClassificationFk
|
||||||
WHERE dateEnd IS NULL
|
WHERE dateEnd IS NULL
|
||||||
ORDER BY ci.creationDate DESC
|
ORDER BY ci.creationDate DESC
|
||||||
LIMIT 10000000000000000000) t1
|
LIMIT 10000000000000000000) t1
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,8 @@ BEGIN
|
||||||
AND buyFk = vBuyFk) THEN
|
AND buyFk = vBuyFk) THEN
|
||||||
|
|
||||||
UPDATE itemShelving
|
UPDATE itemShelving
|
||||||
SET visible = visible + vQuantity
|
SET visible = visible + vQuantity,
|
||||||
|
available = available + vQuantity
|
||||||
WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
|
WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
|
||||||
|
|
||||||
ELSE
|
ELSE
|
||||||
|
|
@ -68,6 +69,6 @@ BEGIN
|
||||||
id
|
id
|
||||||
FROM buy b
|
FROM buy b
|
||||||
WHERE id = vBuyFk;
|
WHERE id = vBuyFk;
|
||||||
END IF;
|
END IF;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
@ -211,8 +211,6 @@ proc: BEGIN
|
||||||
salesInParkingCount INT DEFAULT 0)
|
salesInParkingCount INT DEFAULT 0)
|
||||||
ENGINE = MEMORY;
|
ENGINE = MEMORY;
|
||||||
|
|
||||||
-- Insertamos todos los tickets que tienen productos parkineados
|
|
||||||
-- en sectores de previa, segun el sector
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock
|
CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock
|
||||||
(PRIMARY KEY(itemFk, sectorFk))
|
(PRIMARY KEY(itemFk, sectorFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
|
|
@ -245,7 +243,6 @@ proc: BEGIN
|
||||||
AND s.quantity > 0
|
AND s.quantity > 0
|
||||||
GROUP BY pb.ticketFk;
|
GROUP BY pb.ticketFk;
|
||||||
|
|
||||||
-- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
|
|
||||||
UPDATE tmp.ticketWithPrevia twp
|
UPDATE tmp.ticketWithPrevia twp
|
||||||
JOIN (
|
JOIN (
|
||||||
SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
|
SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
|
||||||
|
|
@ -259,12 +256,28 @@ proc: BEGIN
|
||||||
) sub ON twp.ticketFk = sub.ticketFk
|
) sub ON twp.ticketFk = sub.ticketFk
|
||||||
SET twp.salesInParkingCount = sub.salesInParkingCount;
|
SET twp.salesInParkingCount = sub.salesInParkingCount;
|
||||||
|
|
||||||
-- Marcamos como pendientes aquellos que no coinciden las cantidades
|
|
||||||
UPDATE tmp.productionBuffer pb
|
UPDATE tmp.productionBuffer pb
|
||||||
JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
|
JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
|
||||||
SET pb.previousWithoutParking = TRUE
|
SET pb.previousWithoutParking = TRUE
|
||||||
WHERE twp.salesCount > twp.salesInParkingCount;
|
WHERE twp.salesCount > twp.salesInParkingCount;
|
||||||
|
|
||||||
|
-- hasPlantTray
|
||||||
|
ALTER TABLE tmp.productionBuffer
|
||||||
|
ADD hasPlantTray BOOL DEFAULT FALSE;
|
||||||
|
|
||||||
|
UPDATE tmp.productionBuffer pb
|
||||||
|
JOIN sale s ON s.ticketFk = pb.ticketFk
|
||||||
|
JOIN item i ON i.id = s.itemFk
|
||||||
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk AND lb.item_id = s.itemFk
|
||||||
|
JOIN buy b ON b.id = lb.buy_id
|
||||||
|
JOIN packaging p ON p.id = b.packagingFk
|
||||||
|
JOIN productionConfig pc
|
||||||
|
SET hasPlantTray = TRUE
|
||||||
|
WHERE ic.code = 'plant'
|
||||||
|
AND p.`depth` >= pc.minPlantTrayLength;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE
|
DROP TEMPORARY TABLE
|
||||||
tmp.productionTicket,
|
tmp.productionTicket,
|
||||||
tmp.ticket,
|
tmp.ticket,
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,6 @@ BEGIN
|
||||||
i.itemPackingTypeFk,
|
i.itemPackingTypeFk,
|
||||||
isa.`size`,
|
isa.`size`,
|
||||||
isa.Estado,
|
isa.Estado,
|
||||||
isa.sectorProdPriority,
|
|
||||||
isa.available,
|
isa.available,
|
||||||
isa.sectorFk,
|
isa.sectorFk,
|
||||||
isa.matricula,
|
isa.matricula,
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,10 @@ w1: WHILE vQuantity >= vPacking DO
|
||||||
|
|
||||||
UPDATE sale SET quantity = quantity - vPacking WHERE id = vSaleFk;
|
UPDATE sale SET quantity = quantity - vPacking WHERE id = vSaleFk;
|
||||||
|
|
||||||
UPDATE itemShelving SET visible = visible - vPacking WHERE id = vItemShelvingFk;
|
UPDATE itemShelving
|
||||||
|
SET visible = visible - vPacking,
|
||||||
|
available = available - vPacking
|
||||||
|
WHERE id = vItemShelvingFk;
|
||||||
|
|
||||||
SET vNewSaleFk = NULL;
|
SET vNewSaleFk = NULL;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`creditInsurance_afterIn
|
||||||
BEGIN
|
BEGIN
|
||||||
UPDATE `client` c
|
UPDATE `client` c
|
||||||
JOIN vn.creditClassification cc ON cc.client = c.id
|
JOIN vn.creditClassification cc ON cc.client = c.id
|
||||||
SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassification;
|
SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassificationFk;
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
|
|
||||||
BEFORE INSERT ON `creditInsurance`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
IF NEW.creditClassificationFk THEN
|
|
||||||
SET NEW.creditClassification = NEW.creditClassificationFk;
|
|
||||||
END IF;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`solunionCAP_afterInsert
|
||||||
BEGIN
|
BEGIN
|
||||||
UPDATE client c
|
UPDATE client c
|
||||||
JOIN creditClassification cc ON cc.client = c.id
|
JOIN creditClassification cc ON cc.client = c.id
|
||||||
JOIN creditInsurance ci ON ci.creditClassification = cc.id
|
JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
|
||||||
SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
|
SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,12 @@ BEGIN
|
||||||
IF NEW.dateLeaving IS NOT NULL THEN
|
IF NEW.dateLeaving IS NOT NULL THEN
|
||||||
UPDATE client c
|
UPDATE client c
|
||||||
JOIN creditClassification cc ON cc.client = c.id
|
JOIN creditClassification cc ON cc.client = c.id
|
||||||
JOIN creditInsurance ci ON ci.creditClassification = cc.id
|
JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
|
||||||
SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
|
SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
|
||||||
ELSE
|
ELSE
|
||||||
UPDATE client c
|
UPDATE client c
|
||||||
JOIN creditClassification cc ON cc.client = c.id
|
JOIN creditClassification cc ON cc.client = c.id
|
||||||
JOIN creditInsurance ci ON ci.creditClassification = cc.id
|
JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
|
||||||
SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
|
SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
|
||||||
END IF;
|
END IF;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`solunionCAP_beforeDelet
|
||||||
BEGIN
|
BEGIN
|
||||||
UPDATE client c
|
UPDATE client c
|
||||||
JOIN creditClassification cc ON cc.client = c.id
|
JOIN creditClassification cc ON cc.client = c.id
|
||||||
JOIN creditInsurance ci ON ci.creditClassification = cc.id
|
JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
|
||||||
SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
|
SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ AS SELECT `s`.`id` AS `saleFk`,
|
||||||
`s`.`concept` AS `concept`,
|
`s`.`concept` AS `concept`,
|
||||||
`i`.`size` AS `size`,
|
`i`.`size` AS `size`,
|
||||||
`st`.`name` AS `Estado`,
|
`st`.`name` AS `Estado`,
|
||||||
`st`.`sectorProdPriority` AS `sectorProdPriority`,
|
|
||||||
`stock`.`visible` AS `available`,
|
`stock`.`visible` AS `available`,
|
||||||
`stock`.`sectorFk` AS `sectorFk`,
|
`stock`.`sectorFk` AS `sectorFk`,
|
||||||
`stock`.`shelvingFk` AS `matricula`,
|
`stock`.`shelvingFk` AS `matricula`,
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ AS SELECT `s`.`id` AS `id`,
|
||||||
`s`.`order` AS `order`,
|
`s`.`order` AS `order`,
|
||||||
`s`.`alertLevel` AS `alert_level`,
|
`s`.`alertLevel` AS `alert_level`,
|
||||||
`s`.`code` AS `code`,
|
`s`.`code` AS `code`,
|
||||||
`s`.`sectorProdPriority` AS `sectorProdPriority`,
|
|
||||||
`s`.`nextStateFk` AS `nextStateFk`,
|
`s`.`nextStateFk` AS `nextStateFk`,
|
||||||
`s`.`isPreviousPreparable` AS `isPreviousPreparable`,
|
`s`.`isPreviousPreparable` AS `isPreviousPreparable`,
|
||||||
`s`.`isPicked` AS `isPicked`
|
`s`.`isPicked` AS `isPicked`
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY IF EXISTS collectionWagonTicket_tray;
|
||||||
|
ALTER TABLE vn.wagonConfig DROP FOREIGN KEY IF EXISTS wagonConfig_wagonTypeColor_FK;
|
||||||
|
CREATE OR REPLACE TABLE vn.wagonTypeTray (
|
||||||
|
id INT(11) UNSIGNED,
|
||||||
|
wagonTypeFk INT(11) unsigned NULL,
|
||||||
|
height INT(11) UNSIGNED NULL,
|
||||||
|
wagonTypeColorFk int(11) unsigned NULL,
|
||||||
|
CONSTRAINT wagonTypeTray_pk PRIMARY KEY (id),
|
||||||
|
CONSTRAINT wagonTypeTray_wagonType_FK FOREIGN KEY (wagonTypeFk) REFERENCES vn.wagonType(id) ON DELETE CASCADE ON UPDATE RESTRICT,
|
||||||
|
CONSTRAINT wagonTypeTray_wagonTypeColor_FK FOREIGN KEY (wagonTypeColorFk) REFERENCES vn.wagonTypeColor(id)
|
||||||
|
)
|
||||||
|
ENGINE=InnoDB
|
||||||
|
DEFAULT CHARSET=utf8mb3
|
||||||
|
COLLATE=utf8mb3_unicode_ci;
|
||||||
|
|
||||||
|
ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultHeight INT UNSIGNED DEFAULT 0 NULL COMMENT 'Default height in cm for a base tray';
|
||||||
|
ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultTrayColorFk int(11) unsigned NULL COMMENT 'Default color for a base tray';
|
||||||
|
ALTER TABLE vn.wagonConfig ADD CONSTRAINT wagonConfig_wagonTypeColor_FK FOREIGN KEY (defaultTrayColorFk) REFERENCES vn.wagonTypeColor(id);
|
||||||
|
ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_tray FOREIGN KEY (trayFk) REFERENCES vn.wagonTypeTray(id);
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
ALTER TABLE IF EXISTS `vn`.`payrollWorker`
|
||||||
|
MODIFY COLUMN IF EXISTS `nss__` varchar(23) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `codpuesto__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `codcontrato__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `FAntiguedad__` date NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `grupotarifa__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `codcategoria__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `ContratoTemporal__` tinyint(1) NOT NULL DEFAULT 0 COMMENT '@deprecated 2024-03-15';
|
||||||
|
|
||||||
|
ALTER TABLE IF EXISTS `vn`.`payrollWorkCenter`
|
||||||
|
MODIFY COLUMN IF EXISTS `Centro__` varchar(255) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `nss_cotizacion__` varchar(15) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `domicilio__` varchar(255) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `poblacion__` varchar(45) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `cp__` varchar(5) NOT NULL COMMENT '@deprecated 2024-03-15',
|
||||||
|
MODIFY COLUMN IF EXISTS `empresa_id__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15';
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE vn.state DROP COLUMN sectorProdPriority;
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
|
||||||
|
VALUES( 'Device', 'handleUser', '*', 'ALLOW', 'ROLE', 'employee');
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
ALTER TABLE vn.creditInsurance DROP FOREIGN KEY CreditInsurance_Fk1;
|
||||||
|
ALTER TABLE vn.creditInsurance
|
||||||
|
CHANGE creditClassification creditClassification__ int(11) DEFAULT NULL COMMENT '@deprecated 2024-09-11';
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
-- Place your SQL code here
|
||||||
|
ALTER TABLE vn.productionConfig ADD minPlantTrayLength INT DEFAULT 53 NOT NULL
|
||||||
|
COMMENT 'minimum length for plant tray restriction. Avoid to make collection of the ticket with this kind of item';
|
||||||
|
|
@ -236,6 +236,8 @@
|
||||||
"Cannot send mail": "Cannot send mail",
|
"Cannot send mail": "Cannot send mail",
|
||||||
"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
|
"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
|
||||||
"This postcode already exists": "This postcode already exists",
|
"This postcode already exists": "This postcode already exists",
|
||||||
"Original invoice not found": "Original invoice not found"
|
"Original invoice not found": "Original invoice not found",
|
||||||
|
"There is already a tray with the same height": "There is already a tray with the same height",
|
||||||
|
"The height must be greater than 50cm": "The height must be greater than 50cm",
|
||||||
|
"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -374,5 +374,8 @@
|
||||||
"Original invoice not found": "Factura original no encontrada",
|
"Original invoice not found": "Factura original no encontrada",
|
||||||
"The entry has no lines or does not exist": "La entrada no tiene lineas o no existe",
|
"The entry has no lines or does not exist": "La entrada no tiene lineas o no existe",
|
||||||
"Weight already set": "El peso ya está establecido",
|
"Weight already set": "El peso ya está establecido",
|
||||||
"This ticket is not allocated to your department": "Este ticket no está asignado a tu departamento"
|
"This ticket is not allocated to your department": "Este ticket no está asignado a tu departamento",
|
||||||
|
"There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
|
||||||
|
"The height must be greater than 50cm": "La altura debe ser superior a 50cm",
|
||||||
|
"The maximum height of the wagon is 200cm": "La altura máxima es 200cm"
|
||||||
}
|
}
|
||||||
|
|
@ -46,4 +46,4 @@
|
||||||
"permission": "ALLOW"
|
"permission": "ALLOW"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
module.exports = Self => {
|
|
||||||
Self.remoteMethodCtx('createWagonType', {
|
|
||||||
description: 'Creates a new wagon type',
|
|
||||||
accessType: 'WRITE',
|
|
||||||
accepts: [
|
|
||||||
{
|
|
||||||
arg: 'name',
|
|
||||||
type: 'String',
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
arg: 'divisible',
|
|
||||||
type: 'boolean',
|
|
||||||
required: true
|
|
||||||
}, {
|
|
||||||
arg: 'trays',
|
|
||||||
type: 'any',
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
http: {
|
|
||||||
path: `/createWagonType`,
|
|
||||||
verb: 'PATCH'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Self.createWagonType = async(ctx, options) => {
|
|
||||||
const args = ctx.args;
|
|
||||||
const models = Self.app.models;
|
|
||||||
const myOptions = {};
|
|
||||||
let tx;
|
|
||||||
|
|
||||||
if (typeof options == 'object')
|
|
||||||
Object.assign(myOptions, options);
|
|
||||||
|
|
||||||
if (!myOptions.transaction) {
|
|
||||||
tx = await Self.beginTransaction({});
|
|
||||||
myOptions.transaction = tx;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const newWagonType = await models.WagonType.create({name: args.name, divisible: args.divisible}, myOptions);
|
|
||||||
args.trays.forEach(async tray => {
|
|
||||||
await models.WagonTypeTray.create({
|
|
||||||
typeFk: newWagonType.id,
|
|
||||||
height: tray.position,
|
|
||||||
colorFk: tray.color.id
|
|
||||||
}, myOptions);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (tx) await tx.commit();
|
|
||||||
} catch (e) {
|
|
||||||
if (tx) await tx.rollback();
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
module.exports = Self => {
|
|
||||||
Self.remoteMethodCtx('deleteWagonType', {
|
|
||||||
description: 'Deletes a wagon type',
|
|
||||||
accessType: 'WRITE',
|
|
||||||
accepts: [
|
|
||||||
{
|
|
||||||
arg: 'id',
|
|
||||||
type: 'Number',
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
http: {
|
|
||||||
path: `/deleteWagonType`,
|
|
||||||
verb: 'DELETE'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Self.deleteWagonType = async(ctx, options) => {
|
|
||||||
const args = ctx.args;
|
|
||||||
const models = Self.app.models;
|
|
||||||
const myOptions = {};
|
|
||||||
let tx;
|
|
||||||
|
|
||||||
if (typeof options == 'object')
|
|
||||||
Object.assign(myOptions, options);
|
|
||||||
|
|
||||||
if (!myOptions.transaction) {
|
|
||||||
tx = await Self.beginTransaction({});
|
|
||||||
myOptions.transaction = tx;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
await models.Wagon.destroyAll({typeFk: args.id}, myOptions);
|
|
||||||
await models.WagonTypeTray.destroyAll({typeFk: args.id}, myOptions);
|
|
||||||
await models.WagonType.destroyAll({id: args.id}, myOptions);
|
|
||||||
|
|
||||||
if (tx) await tx.commit();
|
|
||||||
} catch (e) {
|
|
||||||
if (tx) await tx.rollback();
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
module.exports = Self => {
|
|
||||||
Self.remoteMethodCtx('editWagonType', {
|
|
||||||
description: 'Edits a new wagon type',
|
|
||||||
accessType: 'WRITE',
|
|
||||||
accepts: [
|
|
||||||
{
|
|
||||||
arg: 'id',
|
|
||||||
type: 'String',
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
arg: 'name',
|
|
||||||
type: 'String',
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
arg: 'divisible',
|
|
||||||
type: 'boolean',
|
|
||||||
required: true
|
|
||||||
}, {
|
|
||||||
arg: 'trays',
|
|
||||||
type: 'any',
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
http: {
|
|
||||||
path: `/editWagonType`,
|
|
||||||
verb: 'PATCH'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Self.editWagonType = async(ctx, options) => {
|
|
||||||
const args = ctx.args;
|
|
||||||
const models = Self.app.models;
|
|
||||||
const myOptions = {};
|
|
||||||
let tx;
|
|
||||||
|
|
||||||
if (typeof options == 'object')
|
|
||||||
Object.assign(myOptions, options);
|
|
||||||
|
|
||||||
if (!myOptions.transaction) {
|
|
||||||
tx = await Self.beginTransaction({});
|
|
||||||
myOptions.transaction = tx;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const wagonType = await models.WagonType.findById(args.id, null, myOptions);
|
|
||||||
wagonType.updateAttributes({name: args.name, divisible: args.divisible}, myOptions);
|
|
||||||
models.WagonTypeTray.destroyAll({typeFk: args.id}, myOptions);
|
|
||||||
args.trays.forEach(async tray => {
|
|
||||||
await models.WagonTypeTray.create({
|
|
||||||
typeFk: args.id,
|
|
||||||
height: tray.position,
|
|
||||||
colorFk: tray.color.id
|
|
||||||
}, myOptions);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (tx) await tx.commit();
|
|
||||||
} catch (e) {
|
|
||||||
if (tx) await tx.rollback();
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
@ -1,58 +1,16 @@
|
||||||
const models = require('vn-loopback/server/server').models;
|
const models = require('vn-loopback/server/server').models;
|
||||||
|
|
||||||
describe('WagonType crudWagonType()', () => {
|
describe('WagonType crudWagonType()', () => {
|
||||||
const ctx = {
|
|
||||||
args: {
|
|
||||||
name: 'Mock wagon type',
|
|
||||||
divisible: true,
|
|
||||||
trays: [{position: 0, color: {id: 1}},
|
|
||||||
{position: 50, color: {id: 2}},
|
|
||||||
{position: 100, color: {id: 3}}]
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
it(`should create, edit and delete a new wagon type and its trays`, async() => {
|
it(`should create, edit and delete a new wagon type and its trays`, async() => {
|
||||||
const tx = await models.WagonType.beginTransaction({});
|
const tx = await models.WagonType.beginTransaction({});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
// create
|
const wagonType = await models.WagonType.create({name: 'Mock wagon type'}, options);
|
||||||
await models.WagonType.createWagonType(ctx, options);
|
const newWagonTrays = await models.WagonTypeTray.findOne({where: {typeFk: wagonType.id}}, options);
|
||||||
|
|
||||||
const newWagonType = await models.WagonType.findOne({where: {name: ctx.args.name}}, options);
|
expect(newWagonTrays).toBeDefined();
|
||||||
const newWagonTrays = await models.WagonTypeTray.find({where: {typeFk: newWagonType.id}}, options);
|
|
||||||
|
|
||||||
expect(newWagonType).not.toEqual(null);
|
|
||||||
expect(newWagonType.name).toEqual(ctx.args.name);
|
|
||||||
expect(newWagonType.divisible).toEqual(ctx.args.divisible);
|
|
||||||
expect(newWagonTrays.length).toEqual(ctx.args.trays.length);
|
|
||||||
|
|
||||||
ctx.args = {
|
|
||||||
id: newWagonType.id,
|
|
||||||
name: 'Edited wagon type',
|
|
||||||
divisible: false,
|
|
||||||
trays: [{position: 0, color: {id: 1}}]
|
|
||||||
};
|
|
||||||
|
|
||||||
// edit
|
|
||||||
await models.WagonType.editWagonType(ctx, options);
|
|
||||||
|
|
||||||
const editedWagonType = await models.WagonType.findById(newWagonType.id, null, options);
|
|
||||||
const editedWagonTrays = await models.WagonTypeTray.find({where: {typeFk: newWagonType.id}}, options);
|
|
||||||
|
|
||||||
expect(editedWagonType.name).toEqual(ctx.args.name);
|
|
||||||
expect(editedWagonType.divisible).toEqual(ctx.args.divisible);
|
|
||||||
expect(editedWagonTrays.length).toEqual(ctx.args.trays.length);
|
|
||||||
|
|
||||||
// delete
|
|
||||||
await models.WagonType.deleteWagonType(ctx, options);
|
|
||||||
|
|
||||||
const deletedWagonType = await models.WagonType.findById(newWagonType.id, null, options);
|
|
||||||
const deletedWagonTrays = await models.WagonTypeTray.find({where: {typeFk: newWagonType.id}}, options);
|
|
||||||
|
|
||||||
expect(deletedWagonType).toEqual(null);
|
|
||||||
expect(deletedWagonTrays).toEqual([]);
|
|
||||||
|
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
const models = require('vn-loopback/server/server').models;
|
||||||
|
|
||||||
|
describe('WagonTray max height()', () => {
|
||||||
|
it(`should throw an error if the tray's height is above the maximum of the wagon`, async() => {
|
||||||
|
const tx = await models.WagonTypeTray.beginTransaction({});
|
||||||
|
|
||||||
|
let error;
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
|
||||||
|
await models.WagonTypeTray.create({height: 210, wagonTypeFk: 1, wagonTypeColorFk: 4}, options);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
error = e;
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(error.message).toBe('The maximum height of the wagon is 200cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should throw an error if the tray's height is already in the wagon`, async() => {
|
||||||
|
const tx = await models.WagonTypeTray.beginTransaction({});
|
||||||
|
|
||||||
|
let error;
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
|
||||||
|
await models.WagonTypeTray.create({height: 50, wagonTypeFk: 1, wagonTypeColorFk: 2}, options);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
error = e;
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(error.message).toBe('There is already a tray with the same height');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should throw an error if the tray's height is below the minimum between the trays`, async() => {
|
||||||
|
const tx = await models.WagonTypeTray.beginTransaction({});
|
||||||
|
|
||||||
|
let error;
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
|
||||||
|
await models.WagonTypeTray.create({height: 40, wagonTypeFk: 1, wagonTypeColorFk: 4}, options);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
error = e;
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(error.message).toBe('The height must be greater than 50cm');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
@ -25,6 +25,19 @@
|
||||||
},
|
},
|
||||||
"maxTrays": {
|
"maxTrays": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
|
},
|
||||||
|
"defaultHeight": {
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"defaultTrayColorFk": {
|
||||||
|
"type": "number"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"relations": {
|
||||||
|
"WagonTypeColor": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "WagonTypeColor",
|
||||||
|
"foreignKey": "defaultTrayColorFk"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.observe('before save', async ctx => {
|
||||||
|
if (ctx.isNewInstance) {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const {wagonTypeFk, height} = ctx.instance;
|
||||||
|
const trays = await models.WagonTypeTray.find({where: {wagonTypeFk}});
|
||||||
|
|
||||||
|
const config = await models.WagonConfig.findOne();
|
||||||
|
const tray = await models.WagonTypeTray.find({where: {wagonTypeFk, height}});
|
||||||
|
|
||||||
|
if (!trays.length) return;
|
||||||
|
|
||||||
|
if (tray.length)
|
||||||
|
throw new UserError('There is already a tray with the same height');
|
||||||
|
|
||||||
|
if (height < config.minHeightBetweenTrays)
|
||||||
|
throw new UserError('The height must be greater than 50cm');
|
||||||
|
|
||||||
|
if (height > config.maxWagonHeight)
|
||||||
|
throw new UserError('The maximum height of the wagon is 200cm');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
@ -11,13 +11,13 @@
|
||||||
"id": true,
|
"id": true,
|
||||||
"type": "number"
|
"type": "number"
|
||||||
},
|
},
|
||||||
"typeFk": {
|
"wagonTypeFk": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
},
|
},
|
||||||
"height": {
|
"height": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
},
|
},
|
||||||
"colorFk": {
|
"wagonTypeColorFk": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -25,12 +25,12 @@
|
||||||
"type": {
|
"type": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
"model": "WagonType",
|
"model": "WagonType",
|
||||||
"foreignKey": "typeFk"
|
"foreignKey": "wagonTypeFk"
|
||||||
},
|
},
|
||||||
"color": {
|
"color": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
"model": "WagonTypeColor",
|
"model": "WagonTypeColor",
|
||||||
"foreignKey": "colorFk"
|
"foreignKey": "wagonTypeColorFk"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,14 @@
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
require('../methods/wagonType/createWagonType')(Self);
|
Self.observe('after save', async ctx => {
|
||||||
require('../methods/wagonType/editWagonType')(Self);
|
if (ctx.isNewInstance) {
|
||||||
require('../methods/wagonType/deleteWagonType')(Self);
|
const models = Self.app.models;
|
||||||
|
const config = await models.WagonConfig.findOne();
|
||||||
|
|
||||||
|
await models.WagonTypeTray.create({
|
||||||
|
wagonTypeFk: ctx.instance.id,
|
||||||
|
height: config.defaultHeight,
|
||||||
|
wagonTypeColorFk: config.defaultTrayColorFk
|
||||||
|
}, ctx.options);
|
||||||
|
}
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,118 @@
|
||||||
|
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.remoteMethodCtx('handleUser', {
|
||||||
|
description: 'Manage various aspects related to a user with the app',
|
||||||
|
accepts: [
|
||||||
|
{
|
||||||
|
arg: 'androidId',
|
||||||
|
type: 'String',
|
||||||
|
description: 'Android id'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'deviceId',
|
||||||
|
type: 'String',
|
||||||
|
description: 'Device id'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'versionApp',
|
||||||
|
type: 'String',
|
||||||
|
description: 'Version app'
|
||||||
|
}, {
|
||||||
|
arg: 'nameApp',
|
||||||
|
type: 'String',
|
||||||
|
description: 'Version app'
|
||||||
|
},
|
||||||
|
|
||||||
|
],
|
||||||
|
returns: {
|
||||||
|
type: 'object',
|
||||||
|
root: true
|
||||||
|
},
|
||||||
|
http: {
|
||||||
|
path: `/handleUser`,
|
||||||
|
verb: 'POST'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Self.handleUser = async(ctx, androidId, deviceId, versionApp, nameApp, options) => {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const myOptions = {};
|
||||||
|
|
||||||
|
if (typeof options == 'object')
|
||||||
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
|
const accessToken = ctx.req.accessToken;
|
||||||
|
let user = await models.VnUser.findById(accessToken.userId);
|
||||||
|
|
||||||
|
const [[{vIsAuthorized, vMessage}]] =
|
||||||
|
await Self.rawSql('CALL vn.device_checkLogin(?, ?);',
|
||||||
|
[user.id, androidId], myOptions);
|
||||||
|
|
||||||
|
if (!vIsAuthorized)
|
||||||
|
throw new UserError('Not authorized');
|
||||||
|
|
||||||
|
const isUserInOperator = await models.Operator.findOne({
|
||||||
|
where: {
|
||||||
|
workerFk: user.id
|
||||||
|
}
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
if (!isUserInOperator) {
|
||||||
|
await models.Operator.create({
|
||||||
|
'workerFk': user.id,
|
||||||
|
'isOnReservationMode': false
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const whereCondition = deviceId ? {id: deviceId} : {android_id: androidId};
|
||||||
|
const serialNumber =
|
||||||
|
(await models.DeviceProduction.findOne({where: whereCondition}, myOptions))?.serialNumber ?? '';
|
||||||
|
|
||||||
|
await models.DeviceLog.create({
|
||||||
|
'android_id': androidId,
|
||||||
|
'userFk': user.id,
|
||||||
|
'nameApp': nameApp,
|
||||||
|
'versionApp': versionApp,
|
||||||
|
'serialNumber': serialNumber
|
||||||
|
}, myOptions);
|
||||||
|
const getDataUser = await models.VnUser.getCurrentUserData(ctx);
|
||||||
|
|
||||||
|
const getDataOperator = await models.Operator.findOne({
|
||||||
|
where: {workerFk: user.id},
|
||||||
|
fields: ['numberOfWagons', 'warehouseFk', 'itemPackingTypeFk', 'sectorFk', 'sector',
|
||||||
|
'trainFk', 'train', 'labelerFk', 'printer'],
|
||||||
|
include: [
|
||||||
|
{
|
||||||
|
relation: 'sector',
|
||||||
|
scope: {
|
||||||
|
fields: ['warehouseFk', 'description'],
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
relation: 'printer',
|
||||||
|
scope: {
|
||||||
|
fields: ['name'],
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
relation: 'train',
|
||||||
|
scope: {
|
||||||
|
fields: ['name'],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
]
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const getVersion = await models.MobileAppVersionControl.getVersion(ctx, nameApp);
|
||||||
|
|
||||||
|
const combinedResult = {
|
||||||
|
...getDataOperator.toObject(),
|
||||||
|
...getDataUser.toObject(),
|
||||||
|
...getVersion,
|
||||||
|
message: vMessage,
|
||||||
|
serialNumber,
|
||||||
|
};
|
||||||
|
return combinedResult;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
const {models} = require('vn-loopback/server/server');
|
||||||
|
|
||||||
|
describe('Device handleUser()', () => {
|
||||||
|
const ctx = {req: {accessToken: {userId: 9}}};
|
||||||
|
|
||||||
|
it('should return data from user', async() => {
|
||||||
|
const androidId = 'androidid11234567890';
|
||||||
|
const deviceId = 1;
|
||||||
|
const nameApp = 'warehouse';
|
||||||
|
const versionApp = '10';
|
||||||
|
|
||||||
|
const data = await models.Device.handleUser(ctx, androidId, deviceId, versionApp, nameApp);
|
||||||
|
|
||||||
|
expect(data.numberOfWagons).toBe(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -8,19 +8,19 @@ module.exports = Self => {
|
||||||
accepts: [
|
accepts: [
|
||||||
{
|
{
|
||||||
arg: 'id',
|
arg: 'id',
|
||||||
type: 'Number',
|
type: 'number',
|
||||||
description: 'The worker id',
|
description: 'The worker id',
|
||||||
http: {source: 'path'}
|
http: {source: 'path'}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'filter',
|
arg: 'filter',
|
||||||
type: 'Object',
|
type: 'object',
|
||||||
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
|
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
|
||||||
http: {source: 'query'}
|
http: {source: 'query'}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
returns: {
|
returns: {
|
||||||
type: ['Object'],
|
type: ['object'],
|
||||||
root: true
|
root: true
|
||||||
},
|
},
|
||||||
http: {
|
http: {
|
||||||
|
|
@ -36,6 +36,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
// Get ids alloweds
|
// Get ids alloweds
|
||||||
const account = await models.VnUser.findById(userId);
|
const account = await models.VnUser.findById(userId);
|
||||||
|
|
||||||
const stmt = new ParameterizedSQL(
|
const stmt = new ParameterizedSQL(
|
||||||
`SELECT d.id, d.id dmsFk
|
`SELECT d.id, d.id dmsFk
|
||||||
FROM workerDms wd
|
FROM workerDms wd
|
||||||
|
|
@ -45,30 +46,40 @@ module.exports = Self => {
|
||||||
AND rr.role = ?
|
AND rr.role = ?
|
||||||
`, [account.roleFk]
|
`, [account.roleFk]
|
||||||
);
|
);
|
||||||
const yourOwnDms = {and: [{isReadableByWorker: true}, {worker: userId}]};
|
const yourOwnDms = {
|
||||||
const where = {
|
or: [
|
||||||
or: [yourOwnDms, {
|
{and: [
|
||||||
role: {
|
{isReadableByWorker: true},
|
||||||
neq: null
|
{'wd.workerFk': userId}
|
||||||
}
|
]},
|
||||||
}]
|
{
|
||||||
|
role: {
|
||||||
|
neq: null
|
||||||
|
}
|
||||||
|
}]
|
||||||
};
|
};
|
||||||
stmt.merge(conn.makeSuffix(mergeWhere(filter.where, where)));
|
|
||||||
|
|
||||||
// Get workerDms alloweds
|
const where = mergeWhere(filter.where, yourOwnDms);
|
||||||
|
stmt.merge(conn.makeSuffix({where}));
|
||||||
const dmsIds = await conn.executeStmt(stmt);
|
const dmsIds = await conn.executeStmt(stmt);
|
||||||
|
|
||||||
const allowedIds = dmsIds.map(dms => dms.id);
|
const allowedIds = dmsIds.map(dms => dms.id);
|
||||||
const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
|
const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
|
||||||
let workerDms = await models.WorkerDms.find(allowedFilter);
|
|
||||||
|
|
||||||
// Get docuware info
|
const workerDms = await models.WorkerDms.find(allowedFilter);
|
||||||
const docuware = await models.Docuware.findOne({
|
|
||||||
fields: ['dmsTypeFk'],
|
const workerDocuware = filter.skip ? [] : await getDocuware(ctx, id);
|
||||||
where: {code: 'hr', action: 'find'}
|
return workerDms.concat(workerDocuware);
|
||||||
});
|
|
||||||
const docuwareDmsType = docuware.dmsTypeFk;
|
async function getDocuware(ctx, id) {
|
||||||
let workerDocuware = [];
|
const {dmsTypeFk} = await models.Docuware.findOne({
|
||||||
if (!filter.skip && (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType)))) {
|
fields: ['dmsTypeFk'],
|
||||||
|
where: {code: 'hr', action: 'find'}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!await models.DmsType.hasReadRole(ctx, dmsTypeFk)) return [];
|
||||||
|
|
||||||
|
let workerDocuware = [];
|
||||||
const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
|
const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
|
||||||
const docuwareParse = {
|
const docuwareParse = {
|
||||||
'Filename': 'dmsFk',
|
'Filename': 'dmsFk',
|
||||||
|
|
@ -81,7 +92,7 @@ module.exports = Self => {
|
||||||
};
|
};
|
||||||
|
|
||||||
workerDocuware =
|
workerDocuware =
|
||||||
await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
|
await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
|
||||||
const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
|
const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
|
||||||
for (document of workerDocuware) {
|
for (document of workerDocuware) {
|
||||||
const docuwareId = document.id;
|
const docuwareId = document.id;
|
||||||
|
|
@ -106,7 +117,7 @@ module.exports = Self => {
|
||||||
};
|
};
|
||||||
Object.assign(document, defaultData);
|
Object.assign(document, defaultData);
|
||||||
}
|
}
|
||||||
|
return workerDocuware;
|
||||||
}
|
}
|
||||||
return workerDms.concat(workerDocuware);
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
const UserError = require('vn-loopback/util/user-error');
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
|
require('../methods/device/handle-user')(Self);
|
||||||
Self.rewriteDbError(function(err) {
|
Self.rewriteDbError(function(err) {
|
||||||
if (err.code === 'ER_DUP_ENTRY')
|
if (err.code === 'ER_DUP_ENTRY')
|
||||||
return new UserError(``);
|
return new UserError(``);
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ code: vn-database
|
||||||
versionSchema: util
|
versionSchema: util
|
||||||
replace: true
|
replace: true
|
||||||
sumViews: false
|
sumViews: false
|
||||||
|
defaultDefiner: vn@localhost
|
||||||
mockDate: '2001-01-01 12:00:00'
|
mockDate: '2001-01-01 12:00:00'
|
||||||
subdir: db
|
subdir: db
|
||||||
schemas:
|
schemas:
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
"@babel/register": "^7.7.7",
|
"@babel/register": "^7.7.7",
|
||||||
"@commitlint/cli": "^19.2.1",
|
"@commitlint/cli": "^19.2.1",
|
||||||
"@commitlint/config-conventional": "^19.1.0",
|
"@commitlint/config-conventional": "^19.1.0",
|
||||||
"@verdnatura/myt": "^1.6.9",
|
"@verdnatura/myt": "^1.6.11",
|
||||||
"angular-mocks": "^1.7.9",
|
"angular-mocks": "^1.7.9",
|
||||||
"babel-jest": "^26.0.1",
|
"babel-jest": "^26.0.1",
|
||||||
"babel-loader": "^8.2.4",
|
"babel-loader": "^8.2.4",
|
||||||
|
|
|
||||||
|
|
@ -143,8 +143,8 @@ devDependencies:
|
||||||
specifier: ^19.1.0
|
specifier: ^19.1.0
|
||||||
version: 19.1.0
|
version: 19.1.0
|
||||||
'@verdnatura/myt':
|
'@verdnatura/myt':
|
||||||
specifier: ^1.6.9
|
specifier: ^1.6.11
|
||||||
version: 1.6.9
|
version: 1.6.11
|
||||||
angular-mocks:
|
angular-mocks:
|
||||||
specifier: ^1.7.9
|
specifier: ^1.7.9
|
||||||
version: 1.8.3
|
version: 1.8.3
|
||||||
|
|
@ -2846,8 +2846,8 @@ packages:
|
||||||
dev: false
|
dev: false
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
/@verdnatura/myt@1.6.9:
|
/@verdnatura/myt@1.6.11:
|
||||||
resolution: {integrity: sha512-29IauYra9igfdPWwV4+pVV/tBXvIg0fkVHEpSz8Zz3G3lRtzm286FN2Kv6hZkxmD/F1n52O37jN9WLiLHDTW1Q==}
|
resolution: {integrity: sha512-uqdbSJSznBBzAoRkvBt600nUMEPL1PJ2v73eWMZbaoGUMiZiNAehYjs4gIrObP1cxC85JOx97XoLpG0BzPsaig==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
dependencies:
|
dependencies:
|
||||||
'@sqltools/formatter': 1.2.5
|
'@sqltools/formatter': 1.2.5
|
||||||
|
|
@ -3306,6 +3306,7 @@ packages:
|
||||||
|
|
||||||
/are-we-there-yet@1.1.7:
|
/are-we-there-yet@1.1.7:
|
||||||
resolution: {integrity: sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==}
|
resolution: {integrity: sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==}
|
||||||
|
deprecated: This package is no longer supported.
|
||||||
dependencies:
|
dependencies:
|
||||||
delegates: 1.0.0
|
delegates: 1.0.0
|
||||||
readable-stream: 2.3.8
|
readable-stream: 2.3.8
|
||||||
|
|
@ -6593,6 +6594,7 @@ packages:
|
||||||
|
|
||||||
/gauge@2.7.4:
|
/gauge@2.7.4:
|
||||||
resolution: {integrity: sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==}
|
resolution: {integrity: sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==}
|
||||||
|
deprecated: This package is no longer supported.
|
||||||
dependencies:
|
dependencies:
|
||||||
aproba: 1.2.0
|
aproba: 1.2.0
|
||||||
console-control-strings: 1.1.0
|
console-control-strings: 1.1.0
|
||||||
|
|
@ -10814,6 +10816,7 @@ packages:
|
||||||
|
|
||||||
/npmlog@4.1.2:
|
/npmlog@4.1.2:
|
||||||
resolution: {integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==}
|
resolution: {integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==}
|
||||||
|
deprecated: This package is no longer supported.
|
||||||
dependencies:
|
dependencies:
|
||||||
are-we-there-yet: 1.1.7
|
are-we-there-yet: 1.1.7
|
||||||
console-control-strings: 1.1.0
|
console-control-strings: 1.1.0
|
||||||
|
|
@ -11055,6 +11058,7 @@ packages:
|
||||||
|
|
||||||
/osenv@0.1.5:
|
/osenv@0.1.5:
|
||||||
resolution: {integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==}
|
resolution: {integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==}
|
||||||
|
deprecated: This package is no longer supported.
|
||||||
dependencies:
|
dependencies:
|
||||||
os-homedir: 1.0.2
|
os-homedir: 1.0.2
|
||||||
os-tmpdir: 1.0.2
|
os-tmpdir: 1.0.2
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue