feat: refs #6738 crear las Fk de la tabla flight #2054
|
@ -71,6 +71,7 @@ pipeline {
|
||||||
stage('Back') {
|
stage('Back') {
|
||||||
steps {
|
steps {
|
||||||
sh 'pnpm install --prefer-offline'
|
sh 'pnpm install --prefer-offline'
|
||||||
|
sh 'pnpx puppeteer browsers install chrome'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('Print') {
|
stage('Print') {
|
||||||
|
|
|
@ -1356,8 +1356,6 @@ INSERT INTO `ACL` VALUES (385,'Route','driverRoutePdf','READ','ALLOW','ROLE','em
|
||||||
INSERT INTO `ACL` VALUES (386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee');
|
INSERT INTO `ACL` VALUES (386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee');
|
||||||
INSERT INTO `ACL` VALUES (387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer');
|
INSERT INTO `ACL` VALUES (387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer');
|
||||||
INSERT INTO `ACL` VALUES (388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative');
|
INSERT INTO `ACL` VALUES (388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative');
|
||||||
INSERT INTO `ACL` VALUES (389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager');
|
|
||||||
INSERT INTO `ACL` VALUES (390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager');
|
|
||||||
INSERT INTO `ACL` VALUES (391,'Notification','*','WRITE','ALLOW','ROLE','system');
|
INSERT INTO `ACL` VALUES (391,'Notification','*','WRITE','ALLOW','ROLE','system');
|
||||||
INSERT INTO `ACL` VALUES (392,'Boxing','*','*','ALLOW','ROLE','employee');
|
INSERT INTO `ACL` VALUES (392,'Boxing','*','*','ALLOW','ROLE','employee');
|
||||||
INSERT INTO `ACL` VALUES (393,'Url','*','READ','ALLOW','ROLE','employee');
|
INSERT INTO `ACL` VALUES (393,'Url','*','READ','ALLOW','ROLE','employee');
|
||||||
|
|
|
@ -564,13 +564,13 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
|
||||||
|
|
||||||
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
|
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'PLANTS SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
(1, 'PLANTS SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'GOTHAM', 1, 46000, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
||||||
(2, 'FARMER KING', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
(2, 'FARMER KING', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 46000, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
||||||
(69, 'PACKAGING', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
(69, 'PACKAGING', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
||||||
(442, 'VERDNATURA LEVANTE SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
(442, 'VERDNATURA LEVANTE SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
||||||
(567, 'HOLLAND', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
(567, 'HOLLAND', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
||||||
(791, 'BROS SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
(791, 'BROS SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
||||||
(1381, 'ORNAMENTALES', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
|
(1381, 'ORNAMENTALES', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
|
||||||
|
|
||||||
INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
|
INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
|
||||||
VALUES
|
VALUES
|
||||||
|
@ -1826,12 +1826,12 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`,
|
||||||
( 6, 'mana', 'Mana', 72, 4, 0),
|
( 6, 'mana', 'Mana', 72, 4, 0),
|
||||||
( 7, 'lack', 'Faltas', 72, 2, 0);
|
( 7, 'lack', 'Faltas', 72, 2, 0);
|
||||||
|
|
||||||
INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `rma`, `ticketFk`)
|
INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, util.VN_CURDATE(), 1, 1101, 18, 3, 0, util.VN_CURDATE(), 0, '02676A049183', 11),
|
(1, util.VN_CURDATE(), 1, 1101, 18, 3, 0, util.VN_CURDATE(), 0, 11),
|
||||||
(2, util.VN_CURDATE(), 2, 1101, 18, 3, 0, util.VN_CURDATE(), 1, NULL, 16),
|
(2, util.VN_CURDATE(), 2, 1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
|
||||||
(3, util.VN_CURDATE(), 3, 1101, 18, 1, 1, util.VN_CURDATE(), 5, NULL, 7),
|
(3, util.VN_CURDATE(), 3, 1101, 18, 1, 1, util.VN_CURDATE(), 5, 7),
|
||||||
(4, util.VN_CURDATE(), 3, 1104, 18, 5, 0, util.VN_CURDATE(), 10, NULL, 8);
|
(4, util.VN_CURDATE(), 3, 1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
|
||||||
|
|
||||||
INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
|
INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
|
||||||
VALUES
|
VALUES
|
||||||
|
@ -1880,14 +1880,6 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
|
||||||
(1103, 2000, 0.00, 0.00, 0.02, 1.00),
|
(1103, 2000, 0.00, 0.00, 0.02, 1.00),
|
||||||
(1104, 2500, 150.00, 0.02, 0.10, 1.00);
|
(1104, 2500, 150.00, 0.02, 0.10, 1.00);
|
||||||
|
|
||||||
INSERT INTO vn.claimRma (`id`, `code`, `created`, `workerFk`)
|
|
||||||
VALUES
|
|
||||||
(1, '02676A049183', DEFAULT, 1106),
|
|
||||||
(2, '02676A049183', DEFAULT, 1106),
|
|
||||||
(3, '02676A049183', DEFAULT, 1107),
|
|
||||||
(4, '02676A049183', DEFAULT, 1107),
|
|
||||||
(5, '01837B023653', DEFAULT, 1106);
|
|
||||||
|
|
||||||
INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
|
INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
|
(1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`()
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`()
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE vDateShort DATETIME;
|
DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
|
||||||
|
|
||||||
SET vDateShort = TIMESTAMPADD(MONTH, -1, util.VN_CURDATE());
|
|
||||||
|
|
||||||
DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`sale_checkWithoutComponents`
|
|
||||||
ON SCHEDULE EVERY 10 MINUTE
|
|
||||||
STARTS '2020-05-04 11:56:23.000'
|
|
||||||
ON COMPLETION PRESERVE
|
|
||||||
ENABLE
|
|
||||||
DO call sale_checkNoComponents(DATE_ADD(util.VN_NOW(), INTERVAL -10 MINUTE),DATE_ADD(util.VN_NOW(), INTERVAL -1 MINUTE))$$
|
|
||||||
DELIMITER ;
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`(
|
||||||
|
vSelf INT,
|
||||||
|
vName VARCHAR(45)
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Agrega un nuevo nodo hijo a un nodo existente dentro de la estructura
|
||||||
|
* de árbol de vn.balanceNestTree.
|
||||||
|
*
|
||||||
|
* @param vSelf Identificador del nodo
|
||||||
|
* @param vName Nombre del nuevo nodo hijo
|
||||||
|
*/
|
||||||
|
DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
|
||||||
|
DECLARE vLeft INT;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tAux
|
||||||
|
SELECT 0 lft;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE tAux
|
||||||
|
SET lft = (SELECT lft
|
||||||
|
FROM ', vTable,
|
||||||
|
' WHERE id = ?)')
|
||||||
|
USING vSelf;
|
||||||
|
|
||||||
|
SELECT lft INTO vLeft FROM tAux;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable, '
|
||||||
|
SET rgt = rgt + 2
|
||||||
|
WHERE rgt > ?
|
||||||
|
ORDER BY rgt DESC')
|
||||||
|
USING vLeft;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable, '
|
||||||
|
SET lft = lft + 2
|
||||||
|
WHERE lft > ?
|
||||||
|
ORDER BY lft DESC')
|
||||||
|
USING vLeft;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'INSERT INTO ', vTable, ' (name, lft, rgt)
|
||||||
|
VALUES(?, ? + 1, ? + 2)')
|
||||||
|
USING vName,
|
||||||
|
vLeft,
|
||||||
|
vLeft;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tAux;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,53 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_delete`(
|
||||||
|
vSelf INT
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Elimina un nodo dentro de la estructura de árbol de vn.balanceNestTree.
|
||||||
|
*
|
||||||
|
* @param vSelf Identificador del nodo
|
||||||
|
*/
|
||||||
|
DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
|
||||||
|
DECLARE vRight INT;
|
||||||
|
DECLARE vLeft INT;
|
||||||
|
DECLARE vWidth INT;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tAux
|
||||||
|
SELECT 0 rgt, 0 lft, 0 wdt;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE tAux a
|
||||||
|
JOIN ', vTable, ' t
|
||||||
|
SET a.rgt = t.rgt,
|
||||||
|
a.lft = t.lft,
|
||||||
|
a.wdt = t.rgt - t.lft + 1
|
||||||
|
WHERE t.id = ?')
|
||||||
|
USING vSelf;
|
||||||
|
|
||||||
|
SELECT rgt, lft, wdt
|
||||||
|
INTO vRight, vLeft, vWidth
|
||||||
|
FROM tAux;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'DELETE FROM ', vTable,
|
||||||
|
' WHERE lft BETWEEN ? AND ?')
|
||||||
|
USING vLeft, vRight;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
' SET rgt = rgt - ?
|
||||||
|
WHERE rgt > ?
|
||||||
|
ORDER BY rgt')
|
||||||
|
USING vWidth,vRight;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
' SET lft = lft - ?
|
||||||
|
WHERE lft > ?
|
||||||
|
ORDER BY lft')
|
||||||
|
USING vWidth, vRight;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tAux;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,117 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`(
|
||||||
|
vSelf INT,
|
||||||
|
vFather INT
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Mueve un nodo dentro de la estructura de árbol de vn.balanceNestTree.
|
||||||
|
*
|
||||||
|
* @param vSelf Identificador del nodo
|
||||||
|
* @param vFather Identificador del nuevo padre del nodo
|
||||||
|
*/
|
||||||
|
DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
|
||||||
|
DECLARE vRight INT;
|
||||||
|
DECLARE vLeft INT;
|
||||||
|
DECLARE vWidth INT;
|
||||||
|
DECLARE vFatherRight INT;
|
||||||
|
DECLARE vFatherLeft INT;
|
||||||
|
DECLARE vGap INT;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tAux
|
||||||
|
SELECT 0 rgt, 0 lft, 0 wdt, 0 frg, 0 flf;
|
||||||
|
|
||||||
|
-- Averiguamos el ancho de la rama
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE tAux a
|
||||||
|
JOIN ', vTable, ' t
|
||||||
|
SET a.wdt = t.rgt - t.lft + 1
|
||||||
|
WHERE t.id = ?')
|
||||||
|
USING vSelf;
|
||||||
|
|
||||||
|
-- Averiguamos la posicion del nuevo padre
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE tAux a
|
||||||
|
JOIN ', vTable, ' t
|
||||||
|
SET a.frg = t.rgt,
|
||||||
|
a.flf = t.lft
|
||||||
|
WHERE t.id = ?')
|
||||||
|
USING vFather;
|
||||||
|
|
||||||
|
SELECT wdt, frg, flf
|
||||||
|
INTO vWidth, vFatherRight, vFatherLeft
|
||||||
|
FROM tAux;
|
||||||
|
|
||||||
|
-- 1º Incrementamos los valores de todos los nodos a la derecha
|
||||||
|
-- del punto de inserción (vFatherRight) , para hacer sitio
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
'SET rgt = rgt + ?
|
||||||
|
WHERE rgt >= ?
|
||||||
|
ORDER BY rgt DESC')
|
||||||
|
USING vWidth,
|
||||||
|
vFatherRight;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
'SET lft = lft + ?
|
||||||
|
WHERE lft >= ?
|
||||||
|
ORDER BY lft DESC')
|
||||||
|
USING vWidth,
|
||||||
|
vFatherRight;
|
||||||
|
|
||||||
|
-- Es preciso recalcular los valores del nodo en el
|
||||||
|
-- caso de que estuviera a la derecha del nuevo padre
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE tAux a
|
||||||
|
JOIN ', vTable, ' t
|
||||||
|
SET a.rgt = t.rgt,
|
||||||
|
a.lft = t.lft
|
||||||
|
WHERE t.id = ?')
|
||||||
|
USING vSelf;
|
||||||
|
|
||||||
|
SELECT lft, rgt, frg - lft
|
||||||
|
INTO vLeft, vRight, vGap
|
||||||
|
FROM tAux;
|
||||||
|
|
||||||
|
-- 2º Incrementamos el valor de todos los nodos a
|
||||||
|
-- trasladar hasta alcanzar su nueva posicion
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
'SET lft = lft + ?
|
||||||
|
WHERE lft BETWEEN ? AND ?
|
||||||
|
ORDER BY lft DESC')
|
||||||
|
USING vGap,
|
||||||
|
vLeft,
|
||||||
|
vRight;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
'SET rgt = rgt + ?
|
||||||
|
WHERE rgt BETWEEN ? AND ?
|
||||||
|
ORDER BY rgt DESC')
|
||||||
|
USING vGap,
|
||||||
|
vLeft,
|
||||||
|
vRight;
|
||||||
|
|
||||||
|
-- 3º Restaremos a todos los nodos resultantes, a la derecha
|
||||||
|
-- de la posicion arrancada el ancho de la rama escindida
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
'SET lft = lft - ?
|
||||||
|
WHERE lft > ?
|
||||||
|
ORDER BY lft')
|
||||||
|
USING vWidth,
|
||||||
|
vLeft;
|
||||||
|
|
||||||
|
EXECUTE IMMEDIATE CONCAT(
|
||||||
|
'UPDATE ', vTable,
|
||||||
|
'SET rgt = rgt - ?
|
||||||
|
WHERE rgt > ?
|
||||||
|
ORDER BY rgt')
|
||||||
|
USING vWidth,
|
||||||
|
vRight;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tAux;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -1,48 +1,42 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE vDateShort DATETIME;
|
/**
|
||||||
DECLARE vOneYearAgo DATE;
|
* Purges outdated data to optimize performance.
|
||||||
DECLARE vFourYearsAgo DATE;
|
* Exercise caution when executing.
|
||||||
DECLARE vFiveYearsAgo DATE;
|
*/
|
||||||
DECLARE v18Month DATE;
|
DECLARE v2Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 MONTH;
|
||||||
DECLARE v26Month DATE;
|
DECLARE v3Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 3 MONTH;
|
||||||
DECLARE v3Month DATE;
|
DECLARE v18Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 18 MONTH;
|
||||||
|
DECLARE v26Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 26 MONTH;
|
||||||
|
DECLARE v1Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR;
|
||||||
|
DECLARE v2Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 YEAR;
|
||||||
|
DECLARE v4Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 4 YEAR;
|
||||||
|
DECLARE v5Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 5 YEAR;
|
||||||
DECLARE vTrashId VARCHAR(15);
|
DECLARE vTrashId VARCHAR(15);
|
||||||
DECLARE v2Years DATE;
|
DECLARE vCompanyBlk INT;
|
||||||
DECLARE v5Years DATE;
|
|
||||||
|
|
||||||
SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
|
|
||||||
SET vOneYearAgo = util.VN_CURDATE() - INTERVAL 1 YEAR;
|
|
||||||
SET vFourYearsAgo = util.VN_CURDATE() - INTERVAL 4 YEAR;
|
|
||||||
SET vFiveYearsAgo = util.VN_CURDATE() - INTERVAL 5 YEAR;
|
|
||||||
SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
|
|
||||||
SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
|
|
||||||
SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
|
|
||||||
SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
|
|
||||||
SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
|
|
||||||
|
|
||||||
DELETE FROM workerActivity WHERE created < v2Years;
|
DELETE FROM workerActivity WHERE created < v2Years;
|
||||||
DELETE FROM ticketParking WHERE created < vDateShort;
|
DELETE FROM ticketParking WHERE created < v2Months;
|
||||||
DELETE FROM routesMonitor WHERE dated < vDateShort;
|
DELETE FROM routesMonitor WHERE dated < v2Months;
|
||||||
DELETE FROM workerTimeControlLog WHERE created < vDateShort;
|
DELETE FROM workerTimeControlLog WHERE created < v2Months;
|
||||||
DELETE FROM `message` WHERE sendDate < vDateShort;
|
DELETE FROM `message` WHERE sendDate < v2Months;
|
||||||
DELETE FROM messageInbox WHERE sendDate < vDateShort;
|
DELETE FROM messageInbox WHERE sendDate < v2Months;
|
||||||
DELETE FROM messageInbox WHERE sendDate < vDateShort;
|
DELETE FROM messageInbox WHERE sendDate < v2Months;
|
||||||
DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
|
DELETE FROM workerTimeControl WHERE timed < v4Years;
|
||||||
DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
|
DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
|
||||||
DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
|
DELETE FROM ticketDown WHERE created < util.yesterday();
|
||||||
DELETE FROM entryLog WHERE creationDate < vDateShort;
|
DELETE FROM entryLog WHERE creationDate < v2Months;
|
||||||
DELETE IGNORE FROM expedition WHERE created < v26Month;
|
DELETE IGNORE FROM expedition WHERE created < v26Months;
|
||||||
DELETE FROM sms WHERE created < v18Month;
|
DELETE FROM sms WHERE created < v18Months;
|
||||||
DELETE FROM saleTracking WHERE created < vOneYearAgo;
|
DELETE FROM saleTracking WHERE created < v1Years;
|
||||||
DELETE FROM ticketTracking WHERE created < v18Month;
|
DELETE FROM ticketTracking WHERE created < v18Months;
|
||||||
DELETE tobs FROM ticketObservation tobs
|
DELETE tobs FROM ticketObservation tobs
|
||||||
JOIN ticket t ON tobs.ticketFk = t.id
|
JOIN ticket t ON tobs.ticketFk = t.id
|
||||||
WHERE t.shipped < v5Years;
|
WHERE t.shipped < v5Years;
|
||||||
DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
|
DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < v1Years;
|
||||||
DELETE FROM sharingCart where ended < vDateShort;
|
DELETE FROM sharingCart where ended < v2Months;
|
||||||
DELETE FROM sharingClient where ended < vDateShort;
|
DELETE FROM sharingClient where ended < v2Months;
|
||||||
DELETE tw.* FROM ticketWeekly tw
|
DELETE tw.* FROM ticketWeekly tw
|
||||||
LEFT JOIN sale s ON s.ticketFk = tw.ticketFk
|
LEFT JOIN sale s ON s.ticketFk = tw.ticketFk
|
||||||
LEFT JOIN ticketRequest tr ON tr.ticketFk = tw.ticketFk
|
LEFT JOIN ticketRequest tr ON tr.ticketFk = tw.ticketFk
|
||||||
|
@ -50,144 +44,174 @@ BEGIN
|
||||||
WHERE s.id IS NULL
|
WHERE s.id IS NULL
|
||||||
AND tr.id IS NULL
|
AND tr.id IS NULL
|
||||||
AND ts.id IS NULL;
|
AND ts.id IS NULL;
|
||||||
DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
|
DELETE FROM claim WHERE ticketCreated < v4Years;
|
||||||
DELETE FROM message WHERE sendDate < vDateShort;
|
-- Robert ubicacion anterior de travelLog comentario para debug
|
||||||
-- Robert ubicacion anterior de trevelLog comentario para debug
|
DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months;
|
||||||
DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
|
|
||||||
DELETE bm
|
DELETE bm
|
||||||
FROM buyMark bm
|
FROM buyMark bm
|
||||||
JOIN buy b ON b.id = bm.id
|
JOIN buy b ON b.id = bm.id
|
||||||
JOIN entry e ON e.id = b.entryFk
|
JOIN entry e ON e.id = b.entryFk
|
||||||
JOIN travel t ON t.id = e.travelFk
|
JOIN travel t ON t.id = e.travelFk
|
||||||
WHERE t.landed <= vDateShort;
|
WHERE t.landed <= v2Months;
|
||||||
DELETE b FROM vn.buy b
|
DELETE b FROM buy b
|
||||||
JOIN vn.entryConfig e ON e.defaultEntry = b.entryFk
|
JOIN entryConfig e ON e.defaultEntry = b.entryFk
|
||||||
WHERE b.created < vDateShort;
|
WHERE b.created < v2Months;
|
||||||
DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
|
DELETE FROM itemShelvingLog WHERE created < v2Months;
|
||||||
DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
|
DELETE FROM stockBuyed WHERE creationDate < v2Months;
|
||||||
DELETE FROM vn.itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
|
DELETE FROM itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
|
||||||
DELETE FROM printQueue WHERE statusCode = 'printed' AND created < vDateShort;
|
DELETE FROM printQueue WHERE statusCode = 'printed' AND created < v2Months;
|
||||||
DELETE FROM ticketLog WHERE creationDate <= vFiveYearsAgo;
|
DELETE FROM ticketLog WHERE creationDate <= v5Years;
|
||||||
-- Equipos duplicados
|
-- Equipos duplicados
|
||||||
DELETE w.*
|
DELETE w.*
|
||||||
FROM workerTeam w
|
FROM workerTeam w
|
||||||
JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
|
JOIN (
|
||||||
|
SELECT id, team, workerFk, COUNT(*) - 1 duplicated
|
||||||
FROM workerTeam
|
FROM workerTeam
|
||||||
GROUP BY team,workerFk
|
GROUP BY team,workerFk
|
||||||
HAVING duplicated
|
HAVING duplicated
|
||||||
) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
|
) d ON d.team = w.team
|
||||||
|
AND d.workerFk = w.workerFk
|
||||||
|
AND d.id <> w.id;
|
||||||
|
|
||||||
DELETE sc
|
DELETE sc
|
||||||
FROM saleComponent sc
|
FROM saleComponent sc
|
||||||
JOIN sale s ON s.id= sc.saleFk
|
JOIN sale s ON s.id= sc.saleFk
|
||||||
JOIN ticket t ON t.id= s.ticketFk
|
JOIN ticket t ON t.id= s.ticketFk
|
||||||
WHERE t.shipped < v18Month;
|
WHERE t.shipped < v18Months;
|
||||||
|
|
||||||
DELETE c
|
DELETE c
|
||||||
FROM vn.claim c
|
FROM claim c
|
||||||
JOIN vn.claimState cs ON cs.id = c.claimStateFk
|
JOIN claimState cs ON cs.id = c.claimStateFk
|
||||||
WHERE cs.description = "Anulado" AND
|
WHERE cs.description = 'Anulado'
|
||||||
c.created < vDateShort;
|
AND c.created < v2Months;
|
||||||
DELETE
|
|
||||||
FROM vn.expeditionTruck
|
|
||||||
WHERE eta < v3Month;
|
|
||||||
|
|
||||||
DELETE FROM XDiario WHERE FECHA < v3Month OR FECHA IS NULL;
|
DELETE FROM expeditionTruck WHERE eta < v3Months;
|
||||||
-- borrar travels sin entradas
|
DELETE FROM XDiario WHERE FECHA < v3Months OR FECHA IS NULL;
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
|
|
||||||
CREATE TEMPORARY TABLE tmp.thermographToDelete
|
-- Borrar travels sin entradas
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tThermographToDelete
|
||||||
SELECT th.id,th.dmsFk
|
SELECT th.id,th.dmsFk
|
||||||
FROM vn.travel t
|
FROM travel t
|
||||||
LEFT JOIN vn.entry e ON e.travelFk = t.id
|
LEFT JOIN entry e ON e.travelFk = t.id
|
||||||
JOIN vn.travelThermograph th ON th.travelFk = t.id
|
JOIN travelThermograph th ON th.travelFk = t.id
|
||||||
WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
|
WHERE t.shipped < v3Months
|
||||||
|
AND e.travelFk IS NULL;
|
||||||
|
|
||||||
SELECT dt.id INTO vTrashId
|
SELECT dt.id INTO vTrashId
|
||||||
FROM vn.dmsType dt
|
FROM dmsType dt
|
||||||
WHERE dt.code = 'trash';
|
WHERE dt.code = 'trash';
|
||||||
|
|
||||||
UPDATE tmp.thermographToDelete th
|
UPDATE tThermographToDelete th
|
||||||
JOIN vn.dms d ON d.id = th.dmsFk
|
JOIN dms d ON d.id = th.dmsFk
|
||||||
SET d.dmsTypeFk = vTrashId;
|
SET d.dmsTypeFk = vTrashId;
|
||||||
|
|
||||||
DELETE th
|
DELETE th
|
||||||
FROM tmp.thermographToDelete tmp
|
FROM tThermographToDelete tmp
|
||||||
JOIN vn.travelThermograph th ON th.id = tmp.id;
|
JOIN travelThermograph th ON th.id = tmp.id;
|
||||||
|
|
||||||
DELETE t
|
DELETE t
|
||||||
FROM vn.travel t
|
FROM travel t
|
||||||
LEFT JOIN vn.entry e ON e.travelFk = t.id
|
LEFT JOIN entry e ON e.travelFk = t.id
|
||||||
WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
|
WHERE t.shipped < v3Months AND e.travelFk IS NULL;
|
||||||
|
|
||||||
UPDATE dms d
|
UPDATE dms d
|
||||||
JOIN dmsType dt ON dt.id = d.dmsTypeFk
|
JOIN dmsType dt ON dt.id = d.dmsTypeFk
|
||||||
SET d.dmsTypeFk = vTrashId
|
SET d.dmsTypeFk = vTrashId
|
||||||
WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
|
WHERE created < util.VN_CURDATE() - INTERVAL dt.monthToDelete MONTH;
|
||||||
|
|
||||||
-- borrar entradas sin compras
|
-- borrar entradas sin compras
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
|
CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
|
||||||
CREATE TEMPORARY TABLE tmp.entryToDelete
|
|
||||||
SELECT e.*
|
SELECT e.*
|
||||||
FROM vn.entry e
|
FROM entry e
|
||||||
LEFT JOIN vn.buy b ON b.entryFk = e.id
|
LEFT JOIN buy b ON b.entryFk = e.id
|
||||||
JOIN vn.entryConfig ec ON e.id != ec.defaultEntry
|
JOIN entryConfig ec ON e.id <> ec.defaultEntry
|
||||||
WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
|
WHERE e.dated < v3Months
|
||||||
|
AND b.entryFK IS NULL;
|
||||||
|
|
||||||
DELETE e
|
DELETE e
|
||||||
FROM vn.entry e
|
FROM entry e
|
||||||
JOIN tmp.entryToDelete tmp ON tmp.id = e.id;
|
JOIN tEntryToDelete tmp ON tmp.id = e.id;
|
||||||
|
|
||||||
-- borrar de route registros menores a 4 años
|
-- borrar de route registros menores a 4 años
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
|
CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
|
||||||
CREATE TEMPORARY TABLE tmp.routeToDelete
|
|
||||||
SELECT *
|
SELECT *
|
||||||
FROM vn.route r
|
FROM route r
|
||||||
WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());
|
WHERE created < v4Years;
|
||||||
|
|
||||||
UPDATE tmp.routeToDelete tmp
|
UPDATE tRouteToDelete tmp
|
||||||
JOIN vn.dms d ON d.id = tmp.gestdocFk
|
JOIN dms d ON d.id = tmp.gestdocFk
|
||||||
SET d.dmsTypeFk = vTrashId;
|
SET d.dmsTypeFk = vTrashId;
|
||||||
|
|
||||||
DELETE r
|
DELETE r
|
||||||
FROM tmp.routeToDelete tmp
|
FROM tRouteToDelete tmp
|
||||||
JOIN vn.route r ON r.id = tmp.id;
|
JOIN route r ON r.id = tmp.id;
|
||||||
|
|
||||||
-- borrar registros de dua y awb menores a 2 años
|
-- borrar registros de dua y awb menores a 2 años
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
|
CREATE OR REPLACE TEMPORARY TABLE tDuaToDelete
|
||||||
CREATE TEMPORARY TABLE tmp.duaToDelete
|
|
||||||
SELECT *
|
SELECT *
|
||||||
FROM vn.dua
|
FROM dua
|
||||||
WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE());
|
WHERE operated < v2Years;
|
||||||
|
|
||||||
UPDATE tmp.duaToDelete tm
|
UPDATE tDuaToDelete tm
|
||||||
JOIN vn.dms d ON d.id = tm.gestdocFk
|
JOIN dms d ON d.id = tm.gestdocFk
|
||||||
SET d.dmsTypeFk = vTrashId;
|
SET d.dmsTypeFk = vTrashId;
|
||||||
|
|
||||||
DELETE d
|
DELETE d
|
||||||
FROM tmp.duaToDelete tmp
|
FROM tDuaToDelete tmp
|
||||||
JOIN vn.dua d ON d.id = tmp.id;
|
JOIN dua d ON d.id = tmp.id;
|
||||||
|
|
||||||
DELETE a
|
DELETE a
|
||||||
FROM vn.awb a
|
FROM awb a
|
||||||
LEFT JOIN vn.travel t ON t.awbFk = a.id
|
LEFT JOIN travel t ON t.awbFk = a.id
|
||||||
WHERE a.created < v2Years
|
WHERE a.created < v2Years
|
||||||
AND t.id IS NULL;
|
AND t.id IS NULL;
|
||||||
|
|
||||||
-- Borra los registros de collection y ticketcollection
|
-- Borra los registros de collection y ticketcollection
|
||||||
DELETE FROM vn.collection WHERE created < vDateShort;
|
DELETE FROM collection WHERE created < v2Months;
|
||||||
|
DELETE FROM travelLog WHERE creationDate < v3Months;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
|
CALL shelving_clean();
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
|
|
||||||
|
|
||||||
DELETE FROM travelLog WHERE creationDate < v3Month;
|
|
||||||
|
|
||||||
CALL shelving_clean;
|
|
||||||
|
|
||||||
DELETE FROM chat WHERE dated < v5Years;
|
DELETE FROM chat WHERE dated < v5Years;
|
||||||
|
DELETE tt FROM ticketTracking tt
|
||||||
|
JOIN ticket t ON tt.ticketFk = t.id
|
||||||
|
WHERE t.shipped <= v2Months;
|
||||||
|
|
||||||
DELETE tt FROM ticketTracking tt JOIN vn.ticket t ON tt.ticketFk = t.id
|
DELETE FROM mail WHERE creationDate < v2Months;
|
||||||
WHERE t.shipped <= vDateShort;
|
DELETE FROM split WHERE dated < v18Months;
|
||||||
|
DELETE FROM remittance WHERE dated < v18Months;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
|
||||||
|
SELECT DISTINCT tl.originFk ticketFk
|
||||||
|
FROM ticketLog tl
|
||||||
|
JOIN (
|
||||||
|
SELECT MAX(tl.id)ids
|
||||||
|
FROM ticket t
|
||||||
|
JOIN ticketLog tl ON tl.originFk = t.id
|
||||||
|
WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31'
|
||||||
|
AND t.isDeleted
|
||||||
|
GROUP BY t.id
|
||||||
|
) sub ON sub.ids = tl.id
|
||||||
|
WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY;
|
||||||
|
DELETE t
|
||||||
|
FROM ticket t
|
||||||
|
JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
|
||||||
|
|
||||||
|
-- Tickets Nulos PAK 11/10/2016
|
||||||
|
SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
|
||||||
|
UPDATE ticket
|
||||||
|
SET companyFk = vCompanyBlk
|
||||||
|
WHERE clientFk = (SELECT id FROM client WHERE name = 'AUTOCONSUMO')
|
||||||
|
AND companyFk <> vCompanyBlk;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tTicketDelete,
|
||||||
|
tThermographToDelete,
|
||||||
|
tEntryToDelete,
|
||||||
|
tDuaToDelete,
|
||||||
|
tRouteToDelete;
|
||||||
|
|
||||||
|
-- Other schemas
|
||||||
|
DELETE FROM hedera.`order` WHERE date_send < v18Months;
|
||||||
|
DELETE FROM pbx.cdr WHERE call_date < v18Months;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -0,0 +1,103 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`confection_controlSource`(
|
||||||
|
vDated DATE,
|
||||||
|
vScopeDays INT,
|
||||||
|
vMaxAlertLevel INT,
|
||||||
|
vWarehouseFk INT
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Obtiene la información para el control de confección,
|
||||||
|
* ya sean tickets y/o entradas.
|
||||||
|
*
|
||||||
|
* @param vDated Fecha a calcular
|
||||||
|
* @param vScopeDays Número de días desde hoy en adelante que entran en el cálculo.
|
||||||
|
* @param vMaxAlertLevel Id nivel de alerta
|
||||||
|
* @param vWarehouseFk Id de almacén
|
||||||
|
*/
|
||||||
|
DECLARE vEndingDate DATETIME DEFAULT util.dayEnd(vDated) + INTERVAL vScopeDays DAY;
|
||||||
|
|
||||||
|
SELECT t.shipped,
|
||||||
|
t.id ticketFk,
|
||||||
|
s.id saleFk,
|
||||||
|
s.quantity,
|
||||||
|
s.concept,
|
||||||
|
ABS(s.reserved) isReserved,
|
||||||
|
i.category,
|
||||||
|
it.name itemType,
|
||||||
|
t.nickname,
|
||||||
|
wh.name warehouse,
|
||||||
|
t.warehouseFk warehouseFk,
|
||||||
|
a.provinceFk,
|
||||||
|
am.agencyFk,
|
||||||
|
ct.description,
|
||||||
|
stock.visible,
|
||||||
|
stock.available
|
||||||
|
FROM ticket t
|
||||||
|
JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||||
|
JOIN warehouse wh ON wh.id = t.warehouseFk
|
||||||
|
JOIN sale s ON s.ticketFk = t.id
|
||||||
|
JOIN item i ON i.id = s.itemFk
|
||||||
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
|
JOIN confectionType ct ON ct.id = it.making
|
||||||
|
JOIN `address` a on a.id = t.addressFk
|
||||||
|
LEFT JOIN ticketState tls on tls.ticketFk = t.id
|
||||||
|
LEFT JOIN
|
||||||
|
(
|
||||||
|
SELECT item_id,
|
||||||
|
SUM(visible) visible,
|
||||||
|
SUM(available) available
|
||||||
|
FROM (
|
||||||
|
SELECT a.item_id,
|
||||||
|
0 visible,
|
||||||
|
a.available
|
||||||
|
FROM cache.cache_calc cc
|
||||||
|
LEFT JOIN cache.available a ON a.calc_id = cc.id
|
||||||
|
WHERE cc.cache_id IN ('visible', 'available')
|
||||||
|
AND cc.params = CONCAT(vWarehouseFk, "/", util.VN_CURDATE())
|
||||||
|
UNION ALL
|
||||||
|
SELECT v.item_id,
|
||||||
|
v.visible,
|
||||||
|
0
|
||||||
|
FROM cache.cache_calc cc
|
||||||
|
LEFT JOIN cache.visible v ON v.calc_id = cc.id
|
||||||
|
WHERE cc.cacheName IN ('visible', 'available')
|
||||||
|
AND cc.params = vWarehouseFk
|
||||||
|
) sub
|
||||||
|
GROUP BY item_id
|
||||||
|
) stock ON stock.item_id = s.itemFk
|
||||||
|
WHERE it.making
|
||||||
|
AND tls.alertLevel < vMaxAlertLevel
|
||||||
|
AND wh.hasConfectionTeam
|
||||||
|
AND t.shipped BETWEEN vDated AND vEndingDate
|
||||||
|
AND s.quantity > 0
|
||||||
|
UNION ALL
|
||||||
|
SELECT tr.shipped,
|
||||||
|
e.id,
|
||||||
|
NULL,
|
||||||
|
b.quantity,
|
||||||
|
i.name,
|
||||||
|
NULL,
|
||||||
|
i.category,
|
||||||
|
NULL,
|
||||||
|
whi.name,
|
||||||
|
who.name,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
ct.description,
|
||||||
|
NULL,
|
||||||
|
NULL
|
||||||
|
FROM buy b
|
||||||
|
JOIN `entry` e ON e.id = b.entryFk
|
||||||
|
JOIN travel tr ON tr.id = e.travelFk
|
||||||
|
JOIN warehouse whi ON whi.id = tr.warehouseInFk
|
||||||
|
JOIN warehouse who ON who.id = tr.warehouseOutFk
|
||||||
|
JOIN item i ON i.id = b.itemFk
|
||||||
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
|
JOIN confectionType ct ON ct.id = it.making
|
||||||
|
WHERE who.hasConfectionTeam
|
||||||
|
AND it.making
|
||||||
|
AND tr.shipped BETWEEN vDated AND vEndingDate;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -1,87 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Propone articulos disponible ordenado, con la cantidad de veces usado y segun sus caracteristicas
|
|
||||||
*
|
|
||||||
* @param vItemFk item id
|
|
||||||
* @param vTicketFk ticket id
|
|
||||||
* @param vShowType mostrar tipos
|
|
||||||
*/
|
|
||||||
|
|
||||||
DECLARE vWarehouseFk INT;
|
|
||||||
DECLARE vShipped DATE;
|
|
||||||
DECLARE vCalcFk INT;
|
|
||||||
DECLARE vTypeFk INT;
|
|
||||||
|
|
||||||
DECLARE vTag1 VARCHAR(25);
|
|
||||||
DECLARE vTag5 VARCHAR(25);
|
|
||||||
DECLARE vTag6 VARCHAR(25);
|
|
||||||
DECLARE vTag7 VARCHAR(25);
|
|
||||||
DECLARE vTag8 VARCHAR(25);
|
|
||||||
|
|
||||||
DECLARE vValue1 VARCHAR(50);
|
|
||||||
DECLARE vValue5 VARCHAR(50);
|
|
||||||
DECLARE vValue6 VARCHAR(50);
|
|
||||||
DECLARE vValue7 VARCHAR(50);
|
|
||||||
DECLARE vValue8 VARCHAR(50);
|
|
||||||
|
|
||||||
SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
|
|
||||||
FROM vn.ticket
|
|
||||||
WHERE id = vTicketFk;
|
|
||||||
|
|
||||||
SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
|
|
||||||
INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
|
|
||||||
FROM vn.item i
|
|
||||||
LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
|
|
||||||
LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
|
|
||||||
WHERE i.id = vItemFk;
|
|
||||||
|
|
||||||
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
|
|
||||||
|
|
||||||
SELECT i.id itemFk,
|
|
||||||
i.longName,
|
|
||||||
i.subName,
|
|
||||||
i.tag5,
|
|
||||||
i.value5,
|
|
||||||
(i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
|
|
||||||
i.tag6,
|
|
||||||
i.value6,
|
|
||||||
(i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
|
|
||||||
i.tag7,
|
|
||||||
i.value7,
|
|
||||||
(i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
|
|
||||||
i.tag8,
|
|
||||||
i.value8,
|
|
||||||
(i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
|
|
||||||
a.available,
|
|
||||||
IFNULL(ip.counter,0) counter,
|
|
||||||
IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity,
|
|
||||||
iss.visible located
|
|
||||||
FROM item i
|
|
||||||
JOIN cache.available a ON a.item_id = i.id
|
|
||||||
LEFT JOIN itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
|
|
||||||
LEFT JOIN itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
|
|
||||||
LEFT JOIN tag t1 ON t1.id = it1.tagFk
|
|
||||||
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
|
|
||||||
LEFT JOIN buy b ON b.id = lb.buy_id
|
|
||||||
LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id AND iss.warehouseFk = vWarehouseFk
|
|
||||||
WHERE a.calc_id = vCalcFk
|
|
||||||
AND available > 0
|
|
||||||
AND IF(vShowType,i.typeFk = vTypeFk,true)
|
|
||||||
AND i.id != vItemFk
|
|
||||||
ORDER BY counter DESC,
|
|
||||||
(t1.name = vTag1 COLLATE utf8_general_ci) DESC,
|
|
||||||
(it1.value = vValue1 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value8 = vValue8 COLLATE utf8_general_ci) DESC;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,76 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal_beta`(vItemFk INT, vTicketFk INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vWarehouseFk INT;
|
|
||||||
DECLARE vShipped DATE;
|
|
||||||
DECLARE vCalcFk INT;
|
|
||||||
DECLARE vTypeFk INT;
|
|
||||||
DECLARE vResultsMax INT DEFAULT 10;
|
|
||||||
|
|
||||||
DECLARE vTag1 VARCHAR(25);
|
|
||||||
DECLARE vTag5 VARCHAR(25);
|
|
||||||
DECLARE vTag6 VARCHAR(25);
|
|
||||||
DECLARE vTag7 VARCHAR(25);
|
|
||||||
DECLARE vTag8 VARCHAR(25);
|
|
||||||
|
|
||||||
DECLARE vValue1 VARCHAR(50);
|
|
||||||
DECLARE vValue5 VARCHAR(50);
|
|
||||||
DECLARE vValue6 VARCHAR(50);
|
|
||||||
DECLARE vValue7 VARCHAR(50);
|
|
||||||
DECLARE vValue8 VARCHAR(50);
|
|
||||||
|
|
||||||
SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
|
|
||||||
FROM vn.ticket
|
|
||||||
WHERE id = vTicketFk;
|
|
||||||
|
|
||||||
SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
|
|
||||||
INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
|
|
||||||
FROM vn.item i
|
|
||||||
LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
|
|
||||||
LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
|
|
||||||
WHERE i.id = vItemFk;
|
|
||||||
|
|
||||||
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
|
|
||||||
|
|
||||||
SELECT i.id itemFk,
|
|
||||||
i.longName,
|
|
||||||
i.subName,
|
|
||||||
i.tag5,
|
|
||||||
i.value5,
|
|
||||||
(i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
|
|
||||||
i.tag6,
|
|
||||||
i.value6,
|
|
||||||
(i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
|
|
||||||
i.tag7,
|
|
||||||
i.value7,
|
|
||||||
(i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
|
|
||||||
i.tag8,
|
|
||||||
i.value8,
|
|
||||||
(i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
|
|
||||||
a.available,
|
|
||||||
IFNULL(ip.counter,0) counter
|
|
||||||
FROM vn.item i
|
|
||||||
JOIN cache.available a ON a.item_id = i.id
|
|
||||||
LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
|
|
||||||
LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
|
|
||||||
LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
|
|
||||||
WHERE a.calc_id = vCalcFk
|
|
||||||
AND available > 0
|
|
||||||
AND i.typeFk = vTypeFk
|
|
||||||
AND i.id != vItemFk
|
|
||||||
ORDER BY counter DESC,
|
|
||||||
(t1.name = vTag1 COLLATE utf8_general_ci) DESC,
|
|
||||||
(it1.value = vValue1 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
|
|
||||||
(i.value8 = vValue8 COLLATE utf8_general_ci) DESC
|
|
||||||
LIMIT vResultsMax;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,20 +1,24 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(vItemFk INT, vWarehouseFk INT, vDate DATE, vIsShowedByType BOOL)
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
|
||||||
|
vSelf INT,
|
||||||
|
vTicketFk INT,
|
||||||
|
vShowType BOOL
|
||||||
|
)
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Propone articulos similares para posible cambio,
|
* Propone articulos disponibles ordenados, con la cantidad
|
||||||
* ordenado con la cantidad de veces usado y segun sus caracteristicas
|
* de veces usado y segun sus caracteristicas.
|
||||||
*
|
*
|
||||||
* @param vItemFk item id
|
* @param vSelf Id de artículo
|
||||||
* @param vWarehouseFk warehouse id
|
* @param vTicketFk Id de ticket
|
||||||
* @param vDate fecha para revisar disponible
|
* @param vShowType Mostrar tipos
|
||||||
* @param vIsShowedByType para mostrar solo artículos de ese tipo
|
*/
|
||||||
*/
|
DECLARE vWarehouseFk INT;
|
||||||
|
DECLARE vShipped DATE;
|
||||||
|
DECLARE vCalcFk INT;
|
||||||
|
DECLARE vTypeFk INT;
|
||||||
|
DECLARE vPriority INT DEFAULT 1;
|
||||||
|
|
||||||
DECLARE vCalcFk INT;
|
|
||||||
DECLARE vTypeFk INT;
|
|
||||||
|
|
||||||
DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
||||||
DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
||||||
DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
||||||
|
@ -27,58 +31,86 @@ BEGIN
|
||||||
DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
||||||
DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
|
||||||
|
|
||||||
|
SELECT warehouseFk, shipped
|
||||||
SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
|
INTO vWarehouseFk, vShipped
|
||||||
INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
|
FROM ticket
|
||||||
FROM vn.item i
|
WHERE id = vTicketFk;
|
||||||
LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
|
|
||||||
LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
|
|
||||||
WHERE i.id = vItemFk;
|
|
||||||
|
|
||||||
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDate);
|
|
||||||
|
|
||||||
SELECT i.id itemFk,
|
|
||||||
i.longName,
|
|
||||||
i.subName,
|
|
||||||
i.tag5,
|
|
||||||
i.value5,
|
|
||||||
(i.value5 <=> vValue5) match5,
|
|
||||||
i.tag6,
|
|
||||||
i.value6,
|
|
||||||
(i.value6 <=> vValue6) match6,
|
|
||||||
i.tag7,
|
|
||||||
i.value7,
|
|
||||||
(i.value7 <=> vValue7) match7,
|
|
||||||
i.tag8,
|
|
||||||
i.value8,
|
|
||||||
(i.value8 <=> vValue8) match8,
|
|
||||||
a.available,
|
|
||||||
IFNULL(ip.counter,0) counter,
|
|
||||||
IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity
|
|
||||||
FROM vn.item i
|
|
||||||
JOIN cache.available a ON a.item_id = i.id
|
|
||||||
LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
|
|
||||||
LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
|
|
||||||
LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
|
|
||||||
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
|
|
||||||
LEFT JOIN vn.buy b ON b.id = lb.buy_id
|
|
||||||
WHERE a.calc_id = vCalcFk
|
|
||||||
AND available > 0
|
|
||||||
AND IF(vIsShowedByType, i.typeFk = vTypeFk, TRUE)
|
|
||||||
AND i.id != vItemFk
|
|
||||||
ORDER BY counter DESC,
|
|
||||||
(t1.name = vTag1) DESC,
|
|
||||||
(it1.value = vValue1) DESC,
|
|
||||||
(i.tag6 = vTag6) DESC,
|
|
||||||
(i.value6 = vValue6) DESC,
|
|
||||||
(i.tag5 = vTag5) DESC,
|
|
||||||
(i.value5 = vValue5) DESC,
|
|
||||||
(i.tag7 = vTag7) DESC,
|
|
||||||
(i.value7 = vValue7) DESC,
|
|
||||||
(i.tag8 = vTag8) DESC,
|
|
||||||
(i.value8 = vValue8) DESC
|
|
||||||
LIMIT 30;
|
|
||||||
|
|
||||||
|
|
||||||
|
SELECT typeFk,
|
||||||
|
tag5,
|
||||||
|
value5,
|
||||||
|
tag6,
|
||||||
|
value6,
|
||||||
|
tag7,
|
||||||
|
value7,
|
||||||
|
tag8,
|
||||||
|
value8,
|
||||||
|
t.name,
|
||||||
|
it.value
|
||||||
|
INTO vTypeFk,
|
||||||
|
vTag5,
|
||||||
|
vValue5,
|
||||||
|
vTag6,
|
||||||
|
vValue6,
|
||||||
|
vTag7,
|
||||||
|
vValue7,
|
||||||
|
vTag8,
|
||||||
|
vValue8,
|
||||||
|
vTag1,
|
||||||
|
vValue1
|
||||||
|
FROM item i
|
||||||
|
LEFT JOIN itemTag it ON it.itemFk = i.id
|
||||||
|
AND it.priority = vPriority
|
||||||
|
LEFT JOIN tag t ON t.id = it.tagFk
|
||||||
|
WHERE i.id = vSelf;
|
||||||
|
|
||||||
|
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
|
||||||
|
|
||||||
|
SELECT i.id itemFk,
|
||||||
|
i.longName,
|
||||||
|
i.subName,
|
||||||
|
i.tag5,
|
||||||
|
i.value5,
|
||||||
|
(i.value5 <=> vValue5) match5,
|
||||||
|
i.tag6,
|
||||||
|
i.value6,
|
||||||
|
(i.value6 <=> vValue6) match6,
|
||||||
|
i.tag7,
|
||||||
|
i.value7,
|
||||||
|
(i.value7 <=> vValue7) match7,
|
||||||
|
i.tag8,
|
||||||
|
i.value8,
|
||||||
|
(i.value8 <=> vValue8) match8,
|
||||||
|
a.available,
|
||||||
|
IFNULL(ip.counter, 0) `counter`,
|
||||||
|
IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
|
||||||
|
iss.visible located
|
||||||
|
FROM item i
|
||||||
|
JOIN cache.available a ON a.item_id = i.id
|
||||||
|
LEFT JOIN itemProposal ip ON ip.mateFk = i.id
|
||||||
|
AND ip.itemFk = vSelf
|
||||||
|
LEFT JOIN itemTag it ON it.itemFk = i.id
|
||||||
|
AND it.priority = vPriority
|
||||||
|
LEFT JOIN tag t ON t.id = it.tagFk
|
||||||
|
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
|
||||||
|
AND lb.warehouse_id = vWarehouseFk
|
||||||
|
LEFT JOIN buy b ON b.id = lb.buy_id
|
||||||
|
LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
|
||||||
|
AND iss.warehouseFk = vWarehouseFk
|
||||||
|
WHERE a.calc_id = vCalcFk
|
||||||
|
AND a.available > 0
|
||||||
|
AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
|
||||||
|
AND i.id <> vSelf
|
||||||
|
ORDER BY `counter` DESC,
|
||||||
|
(t.name = vTag1) DESC,
|
||||||
|
(it.value = vValue1) DESC,
|
||||||
|
(i.tag5 = vTag5) DESC,
|
||||||
|
match5 DESC,
|
||||||
|
(i.tag6 = vTag6) DESC,
|
||||||
|
match6 DESC,
|
||||||
|
(i.tag7 = vTag7) DESC,
|
||||||
|
match7 DESC,
|
||||||
|
(i.tag8 = vTag8) DESC,
|
||||||
|
match8 DESC;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -0,0 +1,84 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`payment_add`(
|
||||||
|
vDated DATE,
|
||||||
|
vSupplierFk INT,
|
||||||
|
vAmount DOUBLE,
|
||||||
|
vCurrencyFk INT,
|
||||||
|
vForeignValue DOUBLE,
|
||||||
|
vBankFk INT,
|
||||||
|
vPayMethodFk INT,
|
||||||
|
vExpenseFk DOUBLE,
|
||||||
|
vConcept VARCHAR(40),
|
||||||
|
vCompanyFk INT)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Registra un pago realizado a un proveedor y
|
||||||
|
* su correspondiente registro en caja.
|
||||||
|
*
|
||||||
|
* @param vDated Fecha del pago
|
||||||
|
* @param vSupplierFk Id del proveedor
|
||||||
|
* @param vAmount Cantidad a pagar
|
||||||
|
* @param vCurrencyFk Id de la moneda
|
||||||
|
* @param vForeignValue Tipo de cambio utilizado
|
||||||
|
* @param vBankFk Id del banco
|
||||||
|
* @param vPayMethodFk Id del método de pago
|
||||||
|
* @param vExpenseFk Id de gasto
|
||||||
|
* @param vConcept Concepto del pago
|
||||||
|
* @param vCompanyFk Id de la empresa
|
||||||
|
* @return paymentFk Id de pago insertado
|
||||||
|
*/
|
||||||
|
INSERT INTO till(
|
||||||
|
concept,
|
||||||
|
serie,
|
||||||
|
`number`,
|
||||||
|
`out`,
|
||||||
|
dated,
|
||||||
|
isAccountable,
|
||||||
|
bankFk,
|
||||||
|
workerFk,
|
||||||
|
companyFk,
|
||||||
|
isConciliate
|
||||||
|
)
|
||||||
|
SELECT CONCAT('n/pago a ', `name`),
|
||||||
|
'R',
|
||||||
|
vSupplierFk,
|
||||||
|
vAmount,
|
||||||
|
vDated,
|
||||||
|
1,
|
||||||
|
vBankFk,
|
||||||
|
account.myUser_getId(),
|
||||||
|
vCompanyFk,
|
||||||
|
1
|
||||||
|
FROM supplier
|
||||||
|
WHERE id = vSupplierFk;
|
||||||
|
|
||||||
|
INSERT INTO payment(
|
||||||
|
received,
|
||||||
|
dueDated,
|
||||||
|
supplierFk,
|
||||||
|
amount,
|
||||||
|
currencyFk,
|
||||||
|
divisa,
|
||||||
|
bankFk,
|
||||||
|
payMethodFk,
|
||||||
|
bankingFees,
|
||||||
|
concept,
|
||||||
|
companyFk
|
||||||
|
)
|
||||||
|
VALUES(
|
||||||
|
vDated,
|
||||||
|
vDated,
|
||||||
|
vSupplierFk,
|
||||||
|
vAmount,
|
||||||
|
vCurrencyFk,
|
||||||
|
IF(NOT vForeignValue, NULL, vForeignValue),
|
||||||
|
vBankFk,
|
||||||
|
vPayMethodFk,
|
||||||
|
vExpenseFk,
|
||||||
|
vConcept,
|
||||||
|
vCompanyFk
|
||||||
|
);
|
||||||
|
|
||||||
|
SELECT LAST_INSERT_ID() paymentFk;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,70 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`remittance_calc`(
|
||||||
|
vDated DATE
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula los datos de remesa, incluyendo el importe,
|
||||||
|
* el vencimiento, y otros datos relevantes.
|
||||||
|
*
|
||||||
|
* @param vDated Fecha a calcular
|
||||||
|
* @return tmp.remittance
|
||||||
|
*/
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tmp.remittance
|
||||||
|
SELECT CONCAT(s.nif, REPEAT('0', 12 - LENGTH(s.nif))) cif,
|
||||||
|
c.id clientFk,
|
||||||
|
c.name client,
|
||||||
|
c.fi,
|
||||||
|
sub.paymentDate,
|
||||||
|
0 invoiceAmount,
|
||||||
|
CAST(sub.receipt AS DECIMAL(10,2)) receiptAmount,
|
||||||
|
0 currentAmount,
|
||||||
|
sub.companyFk,
|
||||||
|
c.socialName,
|
||||||
|
CAST(sub.receipt AS DECIMAL(10,2)) totalAmount,
|
||||||
|
CAST(sub.receipt AS DECIMAL(10,2)) balance,
|
||||||
|
s.name company,
|
||||||
|
co.code companyCode,
|
||||||
|
c.accountingAccount,
|
||||||
|
c.iban,
|
||||||
|
c.hasSepaVnl,
|
||||||
|
c.hasCoreVnl,
|
||||||
|
c.hasLcr,
|
||||||
|
be.bic,
|
||||||
|
be.`name` entityName
|
||||||
|
FROM client c
|
||||||
|
JOIN (
|
||||||
|
SELECT risk.companyFk,
|
||||||
|
c.id,
|
||||||
|
SUM(risk.amount) receipt,
|
||||||
|
IF((c.dueDay + graceDays) MOD 30.001 <= DAY(vDated),
|
||||||
|
LAST_DAY(vDated - INTERVAL 1 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY,
|
||||||
|
LAST_DAY(vDated - INTERVAL 2 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY
|
||||||
|
) paymentDate
|
||||||
|
FROM client c
|
||||||
|
JOIN payMethod pm ON pm.id = c.payMethodFk
|
||||||
|
JOIN (
|
||||||
|
SELECT cr.companyFk, cr.clientFk, cr.amount
|
||||||
|
FROM client c
|
||||||
|
JOIN clientRisk cr ON cr.clientFk = c.id
|
||||||
|
JOIN payMethod pm ON pm.id = c.payMethodFk
|
||||||
|
WHERE pm.code = 'bankDraft'
|
||||||
|
UNION ALL
|
||||||
|
SELECT io.companyFk, io.clientFk, - io.amount
|
||||||
|
FROM invoiceOut io
|
||||||
|
JOIN client c ON c.id = io.clientFk
|
||||||
|
JOIN payMethod pm ON pm.id = c.payMethodFk
|
||||||
|
WHERE io.dued > vDated
|
||||||
|
AND pm.code = 'bankDraft'
|
||||||
|
AND pm.outstandingDebt
|
||||||
|
AND io.amount > 0
|
||||||
|
|
||||||
|
) risk ON risk.clientFk = c.id
|
||||||
|
GROUP BY risk.companyFk, c.id
|
||||||
|
HAVING receipt > 10
|
||||||
|
) sub ON sub.id = c.id
|
||||||
|
JOIN supplier s ON s.id = sub.companyFk
|
||||||
|
JOIN company co ON co.id = sub.companyFk
|
||||||
|
LEFT JOIN bankEntity be ON be.id = c.bankEntityFk;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -1,70 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_checkNoComponents`(vCreatedFrom DATETIME, vCreatedTo DATETIME)
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* Comprueba que las ventas creadas entre un rango de fechas tienen componentes
|
|
||||||
*
|
|
||||||
* @param vCreatedFrom inicio del rango
|
|
||||||
* @param vCreatedTo fin del rango
|
|
||||||
*/
|
|
||||||
DECLARE v_done BOOL DEFAULT FALSE;
|
|
||||||
DECLARE vSaleFk INTEGER;
|
|
||||||
DECLARE vTicketFk INTEGER;
|
|
||||||
DECLARE vConcept VARCHAR(50);
|
|
||||||
DECLARE vCur CURSOR FOR
|
|
||||||
SELECT s.id
|
|
||||||
FROM sale s
|
|
||||||
JOIN ticket t ON t.id = s.ticketFk
|
|
||||||
JOIN item i ON i.id = s.itemFk
|
|
||||||
JOIN itemType tp ON tp.id = i.typeFk
|
|
||||||
JOIN itemCategory ic ON ic.id = tp.categoryFk
|
|
||||||
LEFT JOIN tmp.coste c ON c.id = s.id
|
|
||||||
WHERE s.created >= vCreatedFrom AND s.created <= vCreatedTo
|
|
||||||
AND c.id IS NULL
|
|
||||||
AND t.agencyModeFk IS NOT NULL
|
|
||||||
AND t.isDeleted IS FALSE
|
|
||||||
AND t.warehouseFk = 60
|
|
||||||
AND ic.merchandise != FALSE
|
|
||||||
GROUP BY s.id;
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND
|
|
||||||
SET v_done = TRUE;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.coste;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.coste;
|
|
||||||
CREATE TEMPORARY TABLE tmp.coste
|
|
||||||
(PRIMARY KEY (id)) ENGINE = MEMORY
|
|
||||||
SELECT s.id
|
|
||||||
FROM sale s
|
|
||||||
JOIN item i ON i.id = s.itemFk
|
|
||||||
JOIN itemType tp ON tp.id = i.typeFk
|
|
||||||
JOIN itemCategory ic ON ic.id = tp.categoryFk
|
|
||||||
JOIN saleComponent sc ON sc.saleFk = s.id
|
|
||||||
JOIN component c ON c.id = sc.componentFk
|
|
||||||
JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 6
|
|
||||||
WHERE s.created >= vCreatedFrom
|
|
||||||
AND ic.merchandise != FALSE;
|
|
||||||
|
|
||||||
OPEN vCur;
|
|
||||||
|
|
||||||
l: LOOP
|
|
||||||
SET v_done = FALSE;
|
|
||||||
FETCH vCur INTO vSaleFk;
|
|
||||||
|
|
||||||
IF v_done THEN
|
|
||||||
LEAVE l;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT ticketFk, concept
|
|
||||||
INTO vTicketFk, vConcept
|
|
||||||
FROM sale
|
|
||||||
WHERE id = vSaleFk;
|
|
||||||
|
|
||||||
CALL sale_calculateComponent(vSaleFk, 'renewPrices');
|
|
||||||
END LOOP;
|
|
||||||
|
|
||||||
CLOSE vCur;
|
|
||||||
DROP TEMPORARY TABLE tmp.coste;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,66 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`CalculoRemesas`(IN vFechaRemesa DATE)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS TMP_REMESAS;
|
|
||||||
CREATE TEMPORARY TABLE TMP_REMESAS
|
|
||||||
SELECT
|
|
||||||
CONCAT(p.NIF,REPEAT('0', 12-LENGTH(p.NIF))) as CIF1,
|
|
||||||
cli.Id_Cliente,
|
|
||||||
cli.Cliente,
|
|
||||||
cli.`IF` as NIF,
|
|
||||||
c.PaymentDate as Vencimiento,
|
|
||||||
0 ImporteFac,
|
|
||||||
cast(c.Recibo as decimal(10,2)) as ImporteRec,
|
|
||||||
0 as ImporteActual,
|
|
||||||
c.companyFk empresa_id,
|
|
||||||
cli.RazonSocial,
|
|
||||||
cast(c.Recibo as decimal(10,2)) as ImporteTotal,
|
|
||||||
cast(c.Recibo as decimal(10,2)) as Saldo,
|
|
||||||
p.Proveedor as Empresa,
|
|
||||||
e.abbreviation as EMP,
|
|
||||||
cli.cuenta,
|
|
||||||
iban AS Iban,
|
|
||||||
CONVERT(SUBSTRING(iban,5,4),UNSIGNED INT) AS nrbe,
|
|
||||||
sepavnl as SEPA,
|
|
||||||
corevnl as RecibidoCORE,
|
|
||||||
hasLcr,
|
|
||||||
be.bic,
|
|
||||||
be.`name` entityName
|
|
||||||
FROM Clientes cli
|
|
||||||
JOIN
|
|
||||||
(SELECT risk.companyFk,
|
|
||||||
c.Id_Cliente,
|
|
||||||
sum(risk.amount) as Recibo,
|
|
||||||
IF((c.Vencimiento + graceDays) mod 30.001 <= day(vFechaRemesa)
|
|
||||||
,TIMESTAMPADD(DAY, (c.Vencimiento + graceDays) MOD 30.001, LAST_DAY(TIMESTAMPADD(MONTH,-1,vFechaRemesa)))
|
|
||||||
,TIMESTAMPADD(DAY, (c.Vencimiento + graceDays) MOD 30.001, LAST_DAY(TIMESTAMPADD(MONTH,-2,vFechaRemesa)))
|
|
||||||
) as PaymentDate
|
|
||||||
FROM Clientes c
|
|
||||||
JOIN pay_met pm on pm.id = pay_met_id
|
|
||||||
JOIN
|
|
||||||
(
|
|
||||||
SELECT companyFk, clientFk, amount
|
|
||||||
FROM Clientes c
|
|
||||||
JOIN vn.clientRisk cr ON cr.clientFk = c.Id_Cliente
|
|
||||||
WHERE pay_met_id = 4
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT io.companyFk, io.clientFk Id_Cliente, - io.amount
|
|
||||||
FROM vn.invoiceOut io
|
|
||||||
JOIN Clientes c ON c.Id_Cliente = io.clientFk
|
|
||||||
JOIN pay_met pm on pm.id = pay_met_id
|
|
||||||
WHERE io.dued > vFechaRemesa
|
|
||||||
AND pay_met_id = 4 AND pm.deudaviva
|
|
||||||
AND io.amount > 0
|
|
||||||
|
|
||||||
) risk ON c.Id_Cliente = risk.clientFk
|
|
||||||
GROUP BY risk.companyFk, Id_Cliente
|
|
||||||
HAVING Recibo > 10
|
|
||||||
) c on c.Id_Cliente = cli.Id_Cliente
|
|
||||||
JOIN Proveedores p on p.Id_Proveedor = c.companyFk
|
|
||||||
JOIN empresa e on e.id = c.companyFk
|
|
||||||
LEFT JOIN vn.bankEntity be ON be.id = cli.bankEntityFk;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,11 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`cacheReset`(vCacheName VARCHAR(10), vParams VARCHAR(15))
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
UPDATE cache.cache_calc
|
|
||||||
SET expires = util.VN_NOW()
|
|
||||||
WHERE cacheName = vCacheName collate utf8_unicode_ci
|
|
||||||
AND params = vParams collate utf8_unicode_ci;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,23 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`camiones`(vWarehouse INT, vDate DATE)
|
|
||||||
BEGIN
|
|
||||||
SELECT Temperatura
|
|
||||||
,ROUND(SUM(Etiquetas * volume)) AS cm3
|
|
||||||
,ROUND(SUM(IF(scanned, Etiquetas, 0) * volume)) AS cm3s
|
|
||||||
,ROUND(SUM(Vida * volume)) AS cm3e
|
|
||||||
FROM (
|
|
||||||
SELECT t.Temperatura, c.Etiquetas, b.scanned, c.Vida,
|
|
||||||
IF(cu.Volumen > 0, cu.Volumen, cu.x * cu.y * IF(cu.z > 0, cu.z, a.Medida + 10)) volume
|
|
||||||
FROM Compres c
|
|
||||||
LEFT JOIN buy_edi b ON b.id = c.buy_edi_id
|
|
||||||
JOIN Articles a ON a.Id_Article = c.Id_Article
|
|
||||||
JOIN Tipos t ON t.tipo_id = a.tipo_id
|
|
||||||
JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada
|
|
||||||
JOIN travel tr ON tr.id = e.travel_id
|
|
||||||
JOIN Cubos cu ON cu.Id_Cubo = c.Id_Cubo
|
|
||||||
WHERE tr.warehouse_id = vWarehouse
|
|
||||||
AND tr.landing = vDate
|
|
||||||
) sub
|
|
||||||
GROUP BY Temperatura;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,79 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`clean`(IN `v_full` TINYINT(1))
|
|
||||||
proc: BEGIN
|
|
||||||
DECLARE vDate DATETIME;
|
|
||||||
DECLARE vDate18 DATETIME;
|
|
||||||
DECLARE vDate26 DATETIME;
|
|
||||||
DECLARE vDate8 DATE;
|
|
||||||
DECLARE vDate6 DATE;
|
|
||||||
DECLARE vDate3 DATE;
|
|
||||||
DECLARE vDate2000 DATE;
|
|
||||||
DECLARE vRangeDeleteTicket INT;
|
|
||||||
DECLARE vStrtable VARCHAR(15) DEFAULT NULL;
|
|
||||||
|
|
||||||
SET vDate = util.VN_CURDATE() - INTERVAL 2 MONTH;
|
|
||||||
SET vDate18 = util.VN_CURDATE() - INTERVAL 18 MONTH;
|
|
||||||
SET vDate26 = util.VN_CURDATE() - INTERVAL 26 MONTH;
|
|
||||||
SET vDate3 = util.VN_CURDATE() - INTERVAL 3 MONTH;
|
|
||||||
SET vDate8 = util.VN_CURDATE() - INTERVAL 8 DAY;
|
|
||||||
SET vDate6 = util.VN_CURDATE() - INTERVAL 6 DAY;
|
|
||||||
SET vDate2000 = util.VN_CURDATE() + INTERVAL (2000 - YEAR(util.VN_CURDATE())) YEAR;
|
|
||||||
SET vRangeDeleteTicket = 60;
|
|
||||||
|
|
||||||
DELETE FROM cdr WHERE calldate < vDate18;
|
|
||||||
DELETE FROM mail WHERE DATE_ODBC < vDate;
|
|
||||||
DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
|
|
||||||
DELETE FROM Splits WHERE Fecha < vDate18;
|
|
||||||
|
|
||||||
DELETE tobs
|
|
||||||
FROM movement_label tobs
|
|
||||||
JOIN Movimientos m ON tobs.Id_Movimiento = m.Id_Movimiento
|
|
||||||
JOIN Tickets t ON m.Id_Ticket = t.Id_Ticket WHERE t.Fecha < vDate;
|
|
||||||
|
|
||||||
DELETE FROM Remesas WHERE `Fecha Remesa` < vDate18;
|
|
||||||
|
|
||||||
DELETE tt.*
|
|
||||||
FROM Tickets_turno tt
|
|
||||||
LEFT JOIN Movimientos m USING(Id_Ticket)
|
|
||||||
WHERE m.Id_Article IS NULL;
|
|
||||||
|
|
||||||
DELETE FROM cl_main WHERE Fecha < vDate18;
|
|
||||||
DELETE FROM hedera.`order` WHERE date_send < vDate18;
|
|
||||||
DELETE FROM vn.message WHERE sendDate < vDate;
|
|
||||||
|
|
||||||
DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
|
|
||||||
|
|
||||||
DELETE cm
|
|
||||||
FROM Compres_mark cm
|
|
||||||
JOIN Compres c ON c.Id_Compra = cm.Id_Compra
|
|
||||||
JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada
|
|
||||||
JOIN travel t ON t.id = e.travel_id
|
|
||||||
WHERE t.landing <= vDate;
|
|
||||||
|
|
||||||
IF v_full THEN
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
|
|
||||||
SELECT DISTINCT tl.originFk ticketFk
|
|
||||||
FROM vn.ticketLog tl
|
|
||||||
JOIN (SELECT MAX(tl.id)ids
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.ticketLog tl ON tl.originFk = t.id
|
|
||||||
WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31'
|
|
||||||
AND t.isDeleted
|
|
||||||
GROUP BY t.id
|
|
||||||
)sub ON sub.ids = tl.id
|
|
||||||
WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY;
|
|
||||||
|
|
||||||
DELETE t
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tTicketDelete;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
-- Tickets Nulos PAK 11/10/2016
|
|
||||||
UPDATE Tickets
|
|
||||||
SET empresa_id = 965
|
|
||||||
WHERE Id_Cliente = 31
|
|
||||||
AND empresa_id != 965;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,6 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`clean_launcher`()
|
|
||||||
BEGIN
|
|
||||||
CALL clean(TRUE);
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,79 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`cobro`(IN datFEC DATE
|
|
||||||
, IN idCLI INT
|
|
||||||
, IN dblIMPORTE DOUBLE
|
|
||||||
, IN idCAJA INT
|
|
||||||
, IN idPAYMET INT
|
|
||||||
, IN strCONCEPTO VARCHAR(40)
|
|
||||||
, IN idEMP INT
|
|
||||||
, IN idWH INT
|
|
||||||
, IN idTRABAJADOR INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE bolCASH BOOLEAN;
|
|
||||||
DECLARE cuenta_banco BIGINT;
|
|
||||||
DECLARE cuenta_cliente BIGINT;
|
|
||||||
DECLARE max_asien INT;
|
|
||||||
-- XDIARIO
|
|
||||||
-- No se asientan los cobros directamente, salvo en el caso de las cajas de CASH
|
|
||||||
SELECT (at2.code = 'cash') INTO bolCASH FROM Bancos b JOIN vn.accountingType at2 ON at2.id = b.cash WHERE b.Id_Banco = idCAJA;
|
|
||||||
IF bolCASH THEN
|
|
||||||
SELECT Cuenta INTO cuenta_banco
|
|
||||||
FROM Bancos
|
|
||||||
WHERE Id_Banco = idCAJA;
|
|
||||||
SELECT Cuenta INTO cuenta_cliente
|
|
||||||
FROM Clientes
|
|
||||||
WHERE Id_Cliente = idCLI;
|
|
||||||
CALL vn.ledger_next(max_asien);
|
|
||||||
INSERT INTO vn.XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
|
|
||||||
SELECT max_asien,datFEC,SUBCTA,CONTRA,strCONCEPTO,EURODEBE,EUROHABER,idEMP
|
|
||||||
FROM(SELECT cuenta_banco SUBCTA, cuenta_cliente CONTRA, 0 EURODEBE, dblIMPORTE EUROHABER
|
|
||||||
UNION ALL
|
|
||||||
SELECT cuenta_cliente SUBCTA, cuenta_banco CONTRA, dblIMPORTE EURODEBE, 0 EUROHABER
|
|
||||||
) gf;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
-- CAJERA
|
|
||||||
INSERT INTO Cajas(Id_Trabajador,
|
|
||||||
Id_Banco,
|
|
||||||
Entrada,
|
|
||||||
Concepto,
|
|
||||||
Cajafecha,
|
|
||||||
Serie,
|
|
||||||
Partida,
|
|
||||||
Numero,
|
|
||||||
empresa_id,
|
|
||||||
warehouse_id
|
|
||||||
)
|
|
||||||
VALUES (idTRABAJADOR,
|
|
||||||
idCAJA,
|
|
||||||
dblIMPORTE,
|
|
||||||
strCONCEPTO,
|
|
||||||
datFEC,
|
|
||||||
'A',
|
|
||||||
TRUE,
|
|
||||||
idCLI,
|
|
||||||
idEMP,
|
|
||||||
idWH
|
|
||||||
);
|
|
||||||
|
|
||||||
-- RECIBO
|
|
||||||
INSERT INTO Recibos(Entregado,
|
|
||||||
Fechacobro,
|
|
||||||
Id_Trabajador,
|
|
||||||
Id_Banco,
|
|
||||||
Id_Cliente,
|
|
||||||
Id_Factura,
|
|
||||||
empresa_id
|
|
||||||
)
|
|
||||||
VALUES ( dblIMPORTE,
|
|
||||||
datFEC,
|
|
||||||
idTRABAJADOR,
|
|
||||||
idCAJA,
|
|
||||||
idCLI,
|
|
||||||
strCONCEPTO,
|
|
||||||
idEMP
|
|
||||||
);
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,105 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`confection_control_source`(vDated DATE, vScopeDays TINYINT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vMidnight DATETIME DEFAULT TIMESTAMP(vDated,'23:59:59');
|
|
||||||
DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,vMidnight);
|
|
||||||
DECLARE maxAlertLevel INT DEFAULT 2;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.production_buffer;
|
|
||||||
|
|
||||||
CREATE TEMPORARY TABLE tmp.production_buffer
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT
|
|
||||||
date(t.Fecha) as Fecha,
|
|
||||||
hour(t.Fecha) as Hora,
|
|
||||||
hour(t.Fecha) as Departure,
|
|
||||||
t.Id_Ticket,
|
|
||||||
m.Id_Movimiento,
|
|
||||||
m.Cantidad,
|
|
||||||
m.Concepte,
|
|
||||||
ABS(m.Reservado) Reservado,
|
|
||||||
i.Categoria,
|
|
||||||
tp.Tipo,
|
|
||||||
t.Alias as Cliente,
|
|
||||||
wh.name as Almacen,
|
|
||||||
t.warehouse_id,
|
|
||||||
cs.province_id,
|
|
||||||
a.agency_id,
|
|
||||||
ct.description as Taller,
|
|
||||||
stock.visible,
|
|
||||||
stock.available
|
|
||||||
FROM vn2008.Tickets t
|
|
||||||
JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
|
|
||||||
JOIN vn.warehouse wh ON wh.id = t.warehouse_id
|
|
||||||
JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
|
|
||||||
JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
|
|
||||||
JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
|
|
||||||
JOIN vn.confectionType ct ON ct.id = tp.confeccion
|
|
||||||
JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
|
|
||||||
LEFT JOIN vn.ticketState tls on tls.ticketFk = t.Id_Ticket
|
|
||||||
LEFT JOIN
|
|
||||||
(
|
|
||||||
SELECT item_id, sum(visible) visible, sum(available) available
|
|
||||||
FROM
|
|
||||||
(
|
|
||||||
SELECT a.item_id, 0 as visible, a.available
|
|
||||||
FROM cache.cache_calc cc
|
|
||||||
LEFT JOIN cache.available a ON a.calc_id = cc.id
|
|
||||||
WHERE cc.cache_id IN (2,8)
|
|
||||||
AND cc.params IN (concat("1/", util.VN_CURDATE()),concat("44/", util.VN_CURDATE()))
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT v.item_id, v.visible, 0 as available
|
|
||||||
FROM cache.cache_calc cc
|
|
||||||
LEFT JOIN cache.visible v ON v.calc_id = cc.id
|
|
||||||
where cc.cache_id IN (2,8) and cc.params IN ("1","44")
|
|
||||||
) sub
|
|
||||||
GROUP BY item_id
|
|
||||||
) stock ON stock.item_id = m.Id_Article
|
|
||||||
WHERE tp.confeccion
|
|
||||||
AND tls.alertLevel < maxAlertLevel
|
|
||||||
AND wh.hasConfectionTeam
|
|
||||||
AND t.Fecha BETWEEN vDated AND vEndingDate
|
|
||||||
AND m.Cantidad > 0;
|
|
||||||
|
|
||||||
-- Entradas
|
|
||||||
|
|
||||||
INSERT INTO tmp.production_buffer(
|
|
||||||
Fecha,
|
|
||||||
Id_Ticket,
|
|
||||||
Cantidad,
|
|
||||||
Concepte,
|
|
||||||
Categoria,
|
|
||||||
Cliente,
|
|
||||||
Almacen,
|
|
||||||
Taller
|
|
||||||
)
|
|
||||||
SELECT
|
|
||||||
tr.shipment AS Fecha,
|
|
||||||
e.Id_Entrada AS Id_Ticket,
|
|
||||||
c.Cantidad,
|
|
||||||
a.Article,
|
|
||||||
a.Categoria,
|
|
||||||
whi.name as Cliente,
|
|
||||||
who.name as Almacen,
|
|
||||||
ct.description as Taller
|
|
||||||
FROM vn2008.Compres c
|
|
||||||
JOIN vn2008.Entradas e ON e.Id_Entrada = c.Id_Entrada
|
|
||||||
JOIN vn2008.travel tr ON tr.id = e.travel_id
|
|
||||||
JOIN vn.warehouse whi ON whi.id = tr.warehouse_id
|
|
||||||
JOIN vn.warehouse who ON who.id = tr.warehouse_id_out
|
|
||||||
JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
|
|
||||||
JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
|
|
||||||
JOIN vn.confectionType ct ON ct.id = tp.confeccion
|
|
||||||
WHERE who.hasConfectionTeam
|
|
||||||
AND tp.confeccion
|
|
||||||
AND tr.shipment BETWEEN vDated AND vEndingDate;
|
|
||||||
|
|
||||||
|
|
||||||
SELECT * FROM tmp.production_buffer;
|
|
||||||
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,48 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`nest_child_add`(
|
|
||||||
vTable VARCHAR(45)
|
|
||||||
,vChild VARCHAR(45)
|
|
||||||
,vFatherId INT
|
|
||||||
)
|
|
||||||
BEGIN
|
|
||||||
DECLARE vMyLeft INT;
|
|
||||||
|
|
||||||
SET vTable = util.quoteIdentifier(vTable);
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS aux;
|
|
||||||
CREATE TEMPORARY TABLE aux
|
|
||||||
SELECT 0 as lft;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE aux
|
|
||||||
SET lft = (SELECT lft
|
|
||||||
FROM ', vTable,
|
|
||||||
' WHERE id = ?)')
|
|
||||||
USING vFatherId;
|
|
||||||
|
|
||||||
SELECT lft INTO vMyLeft FROM aux;
|
|
||||||
DROP TEMPORARY TABLE aux;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable, '
|
|
||||||
SET rgt = rgt + 2
|
|
||||||
WHERE rgt > ?
|
|
||||||
ORDER BY rgt DESC')
|
|
||||||
USING vMyLeft;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable, '
|
|
||||||
SET lft = lft + 2
|
|
||||||
WHERE lft > ?
|
|
||||||
ORDER BY lft DESC')
|
|
||||||
USING vMyLeft;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'INSERT INTO ', vTable, ' (name, lft, rgt)
|
|
||||||
VALUES(?, ? + 1, ? + 2)')
|
|
||||||
USING vChild,
|
|
||||||
vMyLeft,
|
|
||||||
vMyLeft;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,51 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`nest_delete`(
|
|
||||||
vTable VARCHAR(45)
|
|
||||||
,vNodeId INT
|
|
||||||
)
|
|
||||||
BEGIN
|
|
||||||
DECLARE vMyRight INT;
|
|
||||||
DECLARE vMyLeft INT;
|
|
||||||
DECLARE vMyWidth INT;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS aux;
|
|
||||||
CREATE TEMPORARY TABLE aux
|
|
||||||
SELECT 0 rgt, 0 lft, 0 wdt;
|
|
||||||
|
|
||||||
SET vTable = util.quoteIdentifier(vTable);
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE aux a
|
|
||||||
JOIN ', vTable, ' t
|
|
||||||
SET a.rgt = t.rgt,
|
|
||||||
a.lft = t.lft,
|
|
||||||
a.wdt = t.rgt - t.lft + 1
|
|
||||||
WHERE t.id = ?')
|
|
||||||
USING vNodeId;
|
|
||||||
|
|
||||||
SELECT rgt, lft, wdt
|
|
||||||
INTO vMyRight, vMyLeft, vMyWidth
|
|
||||||
FROM aux;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE aux;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'DELETE FROM ', vTable,
|
|
||||||
' WHERE lft BETWEEN ? AND ?')
|
|
||||||
USING vMyLeft, vMyRight;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
' SET rgt = rgt - ?
|
|
||||||
WHERE rgt > ?
|
|
||||||
ORDER BY rgt')
|
|
||||||
USING vMyWidth,vMyRight;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
' SET lft = lft - ?
|
|
||||||
WHERE lft > ?
|
|
||||||
ORDER BY lft')
|
|
||||||
USING vMyWidth, vMyRight;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,108 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`nest_move`(
|
|
||||||
vTable VARCHAR(45)
|
|
||||||
,idNODE INT
|
|
||||||
,idFATHER INT
|
|
||||||
)
|
|
||||||
BEGIN
|
|
||||||
DECLARE myRight INT;
|
|
||||||
DECLARE myLeft INT;
|
|
||||||
DECLARE myWidth INT;
|
|
||||||
DECLARE fatherRight INT;
|
|
||||||
DECLARE fatherLeft INT;
|
|
||||||
DECLARE gap INT;
|
|
||||||
|
|
||||||
SET vTable = util.quoteIdentifier(vTable);
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS aux;
|
|
||||||
CREATE TEMPORARY TABLE aux
|
|
||||||
SELECT 0 as rgt, 0 as lft, 0 as wdt, 0 as frg, 0 as flf;
|
|
||||||
|
|
||||||
-- Averiguamos el ancho de la rama
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE aux a
|
|
||||||
JOIN ', vTable, ' t
|
|
||||||
SET a.wdt = t.rgt - t.lft + 1
|
|
||||||
WHERE t.id = ?')
|
|
||||||
USING idNODE;
|
|
||||||
|
|
||||||
-- Averiguamos la posicion del nuevo padre
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE aux a
|
|
||||||
JOIN ', vTable, ' t
|
|
||||||
SET a.frg = t.rgt,
|
|
||||||
a.flf = t.lft
|
|
||||||
WHERE t.id = ?')
|
|
||||||
USING idFATHER;
|
|
||||||
|
|
||||||
SELECT wdt, frg, flf INTO myWidth, fatherRight, fatherLeft
|
|
||||||
FROM aux;
|
|
||||||
|
|
||||||
-- 1º Incrementamos los valores de todos los nodos a la derecha del punto de inserción (fatherRight) , para hacer sitio
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
'SET rgt = rgt + ?
|
|
||||||
WHERE rgt >= ?
|
|
||||||
ORDER BY rgt DESC')
|
|
||||||
USING myWidth,
|
|
||||||
fatherRight;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
'SET lft = lft + ?
|
|
||||||
WHERE lft >= ?
|
|
||||||
ORDER BY lft DESC')
|
|
||||||
USING myWidth,
|
|
||||||
fatherRight;
|
|
||||||
|
|
||||||
-- Es preciso recalcular los valores del nodo en el caso de que estuviera a la derecha del nuevo padre
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE aux a
|
|
||||||
JOIN ', vTable, ' t
|
|
||||||
SET a.rgt = t.rgt,
|
|
||||||
a.lft = t.lft
|
|
||||||
WHERE t.id = ?')
|
|
||||||
USING idNODE;
|
|
||||||
|
|
||||||
SELECT lft, rgt, frg - lft INTO myLeft, myRight, gap
|
|
||||||
FROM aux;
|
|
||||||
|
|
||||||
-- 2º Incrementamos el valor de todos los nodos a trasladar hasta alcanzar su nueva posicion
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
'SET lft = lft + ?
|
|
||||||
WHERE lft BETWEEN ? AND ?
|
|
||||||
ORDER BY lft DESC')
|
|
||||||
USING gap,
|
|
||||||
myLeft,
|
|
||||||
myRight;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
'SET rgt = rgt + ?
|
|
||||||
WHERE rgt BETWEEN ? AND ?
|
|
||||||
ORDER BY rgt DESC')
|
|
||||||
USING gap,
|
|
||||||
myLeft,
|
|
||||||
myRight;
|
|
||||||
|
|
||||||
-- 3º Restaremos a todos los nodos resultantes, a la derecha de la posicion arrancada el ancho de la rama escindida
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
'SET lft = lft - ?
|
|
||||||
WHERE lft > ?
|
|
||||||
ORDER BY lft')
|
|
||||||
USING myWidth,
|
|
||||||
myLeft;
|
|
||||||
|
|
||||||
EXECUTE IMMEDIATE CONCAT(
|
|
||||||
'UPDATE ', vTable,
|
|
||||||
'SET rgt = rgt - ?
|
|
||||||
WHERE rgt > ?
|
|
||||||
ORDER BY rgt')
|
|
||||||
USING myWidth,
|
|
||||||
myRight;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE aux;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,67 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`pay`(IN datFEC DATE
|
|
||||||
, IN idPROV INT
|
|
||||||
, IN dblIMPORTE DOUBLE
|
|
||||||
, IN idMONEDA INT
|
|
||||||
, IN dblDIVISA DOUBLE
|
|
||||||
, IN idCAJA INT
|
|
||||||
, IN idPAYMET INT
|
|
||||||
, IN dblGASTOS DOUBLE
|
|
||||||
, IN strCONCEPTO VARCHAR(40)
|
|
||||||
, IN idEMP INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
-- Registro en la tabla Cajas
|
|
||||||
INSERT INTO Cajas ( Concepto
|
|
||||||
, Serie
|
|
||||||
, Numero
|
|
||||||
, Salida
|
|
||||||
, Cajafecha
|
|
||||||
, Partida
|
|
||||||
, Id_Banco
|
|
||||||
, Id_Trabajador
|
|
||||||
,empresa_id
|
|
||||||
,conciliado)
|
|
||||||
|
|
||||||
SELECT CONCAT('n/pago a ', Proveedor)
|
|
||||||
, 'R'
|
|
||||||
, idPROV
|
|
||||||
, dblIMPORTE
|
|
||||||
, datFEC
|
|
||||||
, 1
|
|
||||||
, idCAJA
|
|
||||||
, account.myUser_getId()
|
|
||||||
, idEMP
|
|
||||||
, 1
|
|
||||||
FROM Proveedores
|
|
||||||
WHERE Id_Proveedor = idPROV;
|
|
||||||
|
|
||||||
-- Registro en la tabla pago
|
|
||||||
INSERT INTO pago(fecha
|
|
||||||
, dueDated
|
|
||||||
, id_proveedor
|
|
||||||
, importe
|
|
||||||
, id_moneda
|
|
||||||
, divisa
|
|
||||||
, id_banco
|
|
||||||
, pay_met_id
|
|
||||||
, g_bancarios
|
|
||||||
, concepte
|
|
||||||
, empresa_id)
|
|
||||||
|
|
||||||
VALUES(datFEC
|
|
||||||
, datFEC
|
|
||||||
, idPROV
|
|
||||||
, dblIMPORTE
|
|
||||||
, idMONEDA
|
|
||||||
, IF(dblDIVISA = 0, NULL, dblDIVISA)
|
|
||||||
, idCAJA
|
|
||||||
, idPAYMET
|
|
||||||
, dblGASTOS
|
|
||||||
, strCONCEPTO
|
|
||||||
, idEMP);
|
|
||||||
|
|
||||||
SELECT LAST_INSERT_ID() as pago_id;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
-- Place your SQL code here
|
||||||
|
RENAME TABLE IF EXISTS vn.claimRma TO vn.claimRma__;
|
||||||
|
ALTER TABLE IF EXISTS vn.claimRma__ COMMENT='kkeada el 2024-02-26 por Pablo';
|
||||||
|
ALTER TABLE vn.claim CHANGE IF EXISTS rma rma__ varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
|
|
@ -0,0 +1,2 @@
|
||||||
|
DELETE IGNORE FROM bs.nightTask
|
||||||
|
WHERE `procedure` = 'clean_launcher';
|
|
@ -0,0 +1,31 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`()
|
||||||
|
BEGIN
|
||||||
|
SELECT 1;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_addChild TO adminBoss;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_delete`()
|
||||||
|
BEGIN
|
||||||
|
SELECT 1;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_delete TO adminBoss;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`()
|
||||||
|
BEGIN
|
||||||
|
SELECT 1;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_move TO adminBoss;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`payment_add`()
|
||||||
|
BEGIN
|
||||||
|
SELECT 1;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.payment_add TO financial;
|
|
@ -0,0 +1,15 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`confection_controlSource`()
|
||||||
|
BEGIN
|
||||||
|
SELECT 1;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.confection_controlSource TO handmadeBoss, productionAssi, artificialBoss;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`remittance_calc`()
|
||||||
|
BEGIN
|
||||||
|
SELECT 1;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.remittance_calc TO financial;
|
|
@ -1,4 +1,4 @@
|
||||||
Are you sure exit without saving?: ¿Seguro que quieres salir sin guardar?
|
Are you sure exit without saving?: ¿Seguro que quieres salir sin guardar?
|
||||||
Unsaved changes will be lost: Los cambios que no hayas guardado se perderán
|
Unsaved changes will be lost: Los cambios que no hayas guardado se perderán
|
||||||
No changes to save: No hay cambios que guardar
|
No changes to save: No hay cambios que guardar
|
||||||
Some fields are invalid: Algunos campos no son válidos
|
Some fields are invalid: Algunos campos no son válidos
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
// For a detailed explanation regarding each configuration property, visit:
|
// For a detailed explanation regarding each configuration property, visit:
|
||||||
// https://jestjs.io/docs/en/configuration.html
|
// https://jestjs.io/docs/en/configuration.html
|
||||||
/* eslint max-len: ["error", { "code": 150 }]*/
|
/* eslint max-len: ["error", { "code": 150 }]*/
|
||||||
|
const cpus = require('os').cpus().length;
|
||||||
|
const maxCpus = Math.floor(cpus * 0.45);
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
name: 'front end',
|
name: 'front end',
|
||||||
|
@ -12,6 +14,7 @@ module.exports = {
|
||||||
setupFilesAfterEnv: [
|
setupFilesAfterEnv: [
|
||||||
'./front/jest-setup.js'
|
'./front/jest-setup.js'
|
||||||
],
|
],
|
||||||
|
maxWorkers: maxCpus,
|
||||||
testMatch: [
|
testMatch: [
|
||||||
'**/front/**/*.spec.js',
|
'**/front/**/*.spec.js',
|
||||||
'**/print/**/*.spec.js',
|
'**/print/**/*.spec.js',
|
||||||
|
|
|
@ -333,9 +333,11 @@
|
||||||
"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
|
"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
|
||||||
"This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
|
"This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
|
||||||
"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
|
"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
|
||||||
"Incorrect pin": "Pin incorrecto",
|
"Field are invalid": "El campo '{{tag}}' no es válido",
|
||||||
|
"Incorrect pin": "Pin incorrecto.",
|
||||||
"You already have the mailAlias": "Ya tienes este alias de correo",
|
"You already have the mailAlias": "Ya tienes este alias de correo",
|
||||||
"The alias cant be modified": "Este alias de correo no puede ser modificado",
|
"The alias cant be modified": "Este alias de correo no puede ser modificado",
|
||||||
|
"No tickets to invoice": "No hay tickets para facturar",
|
||||||
"this warehouse has not dms": "El Almacén no acepta documentos",
|
"this warehouse has not dms": "El Almacén no acepta documentos",
|
||||||
"This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
|
"This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
|
||||||
"Name should be uppercase": "El nombre debe ir en mayúscula",
|
"Name should be uppercase": "El nombre debe ir en mayúscula",
|
||||||
|
@ -344,6 +346,5 @@
|
||||||
"You cannot update these fields": "No puedes actualizar estos campos",
|
"You cannot update these fields": "No puedes actualizar estos campos",
|
||||||
"CountryFK cannot be empty": "El país no puede estar vacío",
|
"CountryFK cannot be empty": "El país no puede estar vacío",
|
||||||
"Cmr file does not exist": "El archivo del cmr no existe",
|
"Cmr file does not exist": "El archivo del cmr no existe",
|
||||||
"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
|
"You are not allowed to modify the alias": "No estás autorizado a modificar el alias"
|
||||||
"No tickets to invoice": "No hay tickets para facturar"
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,8 +43,5 @@
|
||||||
},
|
},
|
||||||
"ClaimObservation": {
|
"ClaimObservation": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
}
|
||||||
"ClaimRma": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
const LoopBackContext = require('loopback-context');
|
|
||||||
|
|
||||||
module.exports = Self => {
|
|
||||||
Self.observe('before save', async function(ctx) {
|
|
||||||
const changes = ctx.data || ctx.instance;
|
|
||||||
const loopBackContext = LoopBackContext.getCurrentContext();
|
|
||||||
changes.workerFk = loopBackContext.active.accessToken.userId;
|
|
||||||
});
|
|
||||||
};
|
|
|
@ -1,30 +0,0 @@
|
||||||
{
|
|
||||||
"name": "ClaimRma",
|
|
||||||
"base": "VnModel",
|
|
||||||
"options": {
|
|
||||||
"mysql": {
|
|
||||||
"table": "claimRma"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"properties": {
|
|
||||||
"id": {
|
|
||||||
"id": true,
|
|
||||||
"type": "number",
|
|
||||||
"description": "Identifier"
|
|
||||||
},
|
|
||||||
"code": {
|
|
||||||
"type": "string",
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
"created": {
|
|
||||||
"type": "date"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"relations": {
|
|
||||||
"worker": {
|
|
||||||
"type": "belongsTo",
|
|
||||||
"model": "Worker",
|
|
||||||
"foreignKey": "workerFk"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -45,9 +45,6 @@
|
||||||
},
|
},
|
||||||
"packages": {
|
"packages": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
},
|
|
||||||
"rma": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"relations": {
|
"relations": {
|
||||||
|
@ -56,12 +53,6 @@
|
||||||
"model": "ClaimState",
|
"model": "ClaimState",
|
||||||
"foreignKey": "claimStateFk"
|
"foreignKey": "claimStateFk"
|
||||||
},
|
},
|
||||||
"rmas": {
|
|
||||||
"type": "hasMany",
|
|
||||||
"model": "ClaimRma",
|
|
||||||
"foreignKey": "code",
|
|
||||||
"primaryKey": "rma"
|
|
||||||
},
|
|
||||||
"client": {
|
"client": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
"model": "Client",
|
"model": "Client",
|
||||||
|
|
|
@ -26,23 +26,23 @@ module.exports = Self => {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'street',
|
arg: 'street',
|
||||||
type: 'string'
|
type: 'any'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'postcode',
|
arg: 'postcode',
|
||||||
type: 'string'
|
type: 'any'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'city',
|
arg: 'city',
|
||||||
type: 'string'
|
type: 'any'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'countryFk',
|
arg: 'countryFk',
|
||||||
type: 'number'
|
type: 'any'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'provinceFk',
|
arg: 'provinceFk',
|
||||||
type: 'number'
|
type: 'any'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'sageTaxTypeFk',
|
arg: 'sageTaxTypeFk',
|
||||||
|
@ -94,7 +94,7 @@ module.exports = Self => {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'despiteOfClient',
|
arg: 'despiteOfClient',
|
||||||
type: 'number'
|
type: 'any'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'hasIncoterms',
|
arg: 'hasIncoterms',
|
||||||
|
|
|
@ -26,7 +26,8 @@ describe('Supplier newSupplier()', () => {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
ctx.args = {
|
ctx.args = {
|
||||||
name: 'NEWSUPPLIER',
|
name: 'NEWSUPPLIER',
|
||||||
nif: '12345678Z'
|
nif: '12345678Z',
|
||||||
|
city: 'Gotham'
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = await models.Supplier.newSupplier(ctx, options);
|
const result = await models.Supplier.newSupplier(ctx, options);
|
||||||
|
|
|
@ -19,7 +19,7 @@ module.exports = Self => {
|
||||||
type: 'any'
|
type: 'any'
|
||||||
}, {
|
}, {
|
||||||
arg: 'phone',
|
arg: 'phone',
|
||||||
type: 'string'
|
type: 'any'
|
||||||
}, {
|
}, {
|
||||||
arg: 'sageTaxTypeFk',
|
arg: 'sageTaxTypeFk',
|
||||||
type: 'any'
|
type: 'any'
|
||||||
|
@ -46,10 +46,10 @@ module.exports = Self => {
|
||||||
type: 'any'
|
type: 'any'
|
||||||
}, {
|
}, {
|
||||||
arg: 'supplierActivityFk',
|
arg: 'supplierActivityFk',
|
||||||
type: 'string'
|
type: 'any'
|
||||||
}, {
|
}, {
|
||||||
arg: 'healthRegister',
|
arg: 'healthRegister',
|
||||||
type: 'string'
|
type: 'any'
|
||||||
}, {
|
}, {
|
||||||
arg: 'isVies',
|
arg: 'isVies',
|
||||||
type: 'boolean'
|
type: 'boolean'
|
||||||
|
|
|
@ -129,10 +129,13 @@ describe('loopback model Supplier', () => {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const newSupplier = await models.Supplier.create({name: 'ALFRED PENNYWORTH'}, options);
|
const newSupplier = {
|
||||||
const fetchedSupplier = await models.Supplier.findById(newSupplier.id, null, options);
|
name: 'ALFRED PENNYWORTH', nif: '87805752D', city: 'Gotham'
|
||||||
|
};
|
||||||
|
const supplierCreated = await models.Supplier.create(newSupplier, options);
|
||||||
|
const fetchedSupplier = await models.Supplier.findById(supplierCreated.id, null, options);
|
||||||
|
|
||||||
expect(Number(fetchedSupplier.account)).toEqual(4100000000 + newSupplier.id);
|
expect(Number(fetchedSupplier.account)).toEqual(4100000000 + supplierCreated.id);
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
|
|
|
@ -17,17 +17,13 @@ module.exports = Self => {
|
||||||
message: 'The social name cannot be empty'
|
message: 'The social name cannot be empty'
|
||||||
});
|
});
|
||||||
|
|
||||||
if (this.city) {
|
Self.validatesPresenceOf('city', {
|
||||||
Self.validatesPresenceOf('city', {
|
message: 'City cannot be empty'
|
||||||
message: 'City cannot be empty'
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.nif) {
|
Self.validatesPresenceOf('nif', {
|
||||||
Self.validatesPresenceOf('nif', {
|
message: 'The nif cannot be empty'
|
||||||
message: 'The nif cannot be empty'
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Self.validatesUniquenessOf('nif', {
|
Self.validatesUniquenessOf('nif', {
|
||||||
message: 'TIN must be unique'
|
message: 'TIN must be unique'
|
||||||
|
|
|
@ -19,6 +19,7 @@ module.exports = Self => {
|
||||||
FROM ticketTracking tt
|
FROM ticketTracking tt
|
||||||
WHERE tt.userFk = ?
|
WHERE tt.userFk = ?
|
||||||
GROUP BY ticketFk
|
GROUP BY ticketFk
|
||||||
|
ORDER BY created DESC
|
||||||
LIMIT 5;`;
|
LIMIT 5;`;
|
||||||
return await Self.rawSql(query, [userId]);
|
return await Self.rawSql(query, [userId]);
|
||||||
};
|
};
|
||||||
|
|
|
@ -179,7 +179,6 @@ localFixtures:
|
||||||
- claimLog
|
- claimLog
|
||||||
- claimObservation
|
- claimObservation
|
||||||
- claimRatio
|
- claimRatio
|
||||||
- claimRma
|
|
||||||
- claimState
|
- claimState
|
||||||
- client
|
- client
|
||||||
- clientConfig
|
- clientConfig
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-back",
|
"name": "salix-back",
|
||||||
"version": "24.10.0",
|
"version": "24.12.0",
|
||||||
"author": "Verdnatura Levante SL",
|
"author": "Verdnatura Levante SL",
|
||||||
"description": "Salix backend",
|
"description": "Salix backend",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
|
|
|
@ -3786,7 +3786,7 @@ packages:
|
||||||
resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
|
resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
|
||||||
dependencies:
|
dependencies:
|
||||||
base64-js: 1.5.1
|
base64-js: 1.5.1
|
||||||
ieee754: 1.1.13
|
ieee754: 1.2.1
|
||||||
isarray: 1.0.0
|
isarray: 1.0.0
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
@ -7288,8 +7288,8 @@ packages:
|
||||||
- supports-color
|
- supports-color
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/http-proxy-agent@7.0.0:
|
/http-proxy-agent@7.0.2:
|
||||||
resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
|
resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
|
||||||
engines: {node: '>= 14'}
|
engines: {node: '>= 14'}
|
||||||
dependencies:
|
dependencies:
|
||||||
agent-base: 7.1.0
|
agent-base: 7.1.0
|
||||||
|
@ -7367,8 +7367,8 @@ packages:
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
/https-proxy-agent@7.0.2:
|
/https-proxy-agent@7.0.4:
|
||||||
resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
|
resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==}
|
||||||
engines: {node: '>= 14'}
|
engines: {node: '>= 14'}
|
||||||
dependencies:
|
dependencies:
|
||||||
agent-base: 7.1.0
|
agent-base: 7.1.0
|
||||||
|
@ -9780,6 +9780,7 @@ packages:
|
||||||
|
|
||||||
/mkdirp-classic@0.5.3:
|
/mkdirp-classic@0.5.3:
|
||||||
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
|
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
|
||||||
|
requiresBuild: true
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/mkdirp@0.3.0:
|
/mkdirp@0.3.0:
|
||||||
|
@ -10692,8 +10693,8 @@ packages:
|
||||||
agent-base: 7.1.0
|
agent-base: 7.1.0
|
||||||
debug: 4.3.4(supports-color@6.1.0)
|
debug: 4.3.4(supports-color@6.1.0)
|
||||||
get-uri: 6.0.2
|
get-uri: 6.0.2
|
||||||
http-proxy-agent: 7.0.0
|
http-proxy-agent: 7.0.2
|
||||||
https-proxy-agent: 7.0.2
|
https-proxy-agent: 7.0.4
|
||||||
pac-resolver: 7.0.0
|
pac-resolver: 7.0.0
|
||||||
socks-proxy-agent: 8.0.2
|
socks-proxy-agent: 8.0.2
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
|
@ -11155,8 +11156,8 @@ packages:
|
||||||
dependencies:
|
dependencies:
|
||||||
agent-base: 7.1.0
|
agent-base: 7.1.0
|
||||||
debug: 4.3.4(supports-color@6.1.0)
|
debug: 4.3.4(supports-color@6.1.0)
|
||||||
http-proxy-agent: 7.0.0
|
http-proxy-agent: 7.0.2
|
||||||
https-proxy-agent: 7.0.2
|
https-proxy-agent: 7.0.4
|
||||||
lru-cache: 7.18.3
|
lru-cache: 7.18.3
|
||||||
pac-proxy-agent: 7.0.1
|
pac-proxy-agent: 7.0.1
|
||||||
proxy-from-env: 1.1.0
|
proxy-from-env: 1.1.0
|
||||||
|
@ -11288,6 +11289,7 @@ packages:
|
||||||
|
|
||||||
/queue-tick@1.0.1:
|
/queue-tick@1.0.1:
|
||||||
resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
|
resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
|
||||||
|
requiresBuild: true
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/quick-lru@4.0.1:
|
/quick-lru@4.0.1:
|
||||||
|
|
|
@ -3,7 +3,7 @@ html {
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
}
|
}
|
||||||
.mainTable, .specialTable, .categoryTable {
|
.mainTable, .specialTable, .categoryTable, .observationTable {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
|
@ -98,4 +98,19 @@ img {
|
||||||
#merchandiseLabels td {
|
#merchandiseLabels td {
|
||||||
padding-bottom: 11px;
|
padding-bottom: 11px;
|
||||||
max-width: 300px;
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.observationTable tr td {
|
||||||
|
border: none;
|
||||||
|
padding: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#qrSection {
|
||||||
|
text-align: center;
|
||||||
|
width: 30%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#truckPlateQr {
|
||||||
|
width: 125px;
|
||||||
|
margin-bottom: 10px;
|
||||||
}
|
}
|
|
@ -30,8 +30,11 @@
|
||||||
<span id="label">16. Transportista / Transporteur / Carrier</span>
|
<span id="label">16. Transportista / Transporteur / Carrier</span>
|
||||||
<hr>
|
<hr>
|
||||||
<b>{{data.carrierName}}</b><br>
|
<b>{{data.carrierName}}</b><br>
|
||||||
{{data.carrierStreet}}<br>
|
{{data.carrierStreet}} {{data.carrierPostalCode}}
|
||||||
{{data.carrierPostalCode}} {{data.carrierCity}} {{(data.carrierCountry) ? `(${data.carrierCountry})` : null}}
|
{{data.carrierCity}} {{(data.carrierCountry)
|
||||||
|
? `(${data.carrierCountry})`
|
||||||
|
: null}}<br>
|
||||||
|
<b>CIF:</b> {{data.carrierCif}}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -71,8 +74,19 @@
|
||||||
Carrier's reservations and observations
|
Carrier's reservations and observations
|
||||||
</span>
|
</span>
|
||||||
<hr>
|
<hr>
|
||||||
<b>{{data.truckPlate}}</b><br>
|
<table class="observationTable">
|
||||||
{{data.observations}}
|
<tr>
|
||||||
|
<td>
|
||||||
|
{{data.observations}}
|
||||||
|
</td>
|
||||||
|
<td id="qrSection">
|
||||||
|
<img id="truckPlateQr" v-bind:src="truckPlateQr"/>
|
||||||
|
<br>
|
||||||
|
<b>{{data.truckPlate}}</b>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -2,44 +2,51 @@ const config = require(`vn-print/core/config`);
|
||||||
const vnReport = require('../../../core/mixins/vn-report.js');
|
const vnReport = require('../../../core/mixins/vn-report.js');
|
||||||
const md5 = require('md5');
|
const md5 = require('md5');
|
||||||
const fs = require('fs-extra');
|
const fs = require('fs-extra');
|
||||||
|
const qrcode = require('qrcode');
|
||||||
|
|
||||||
const prefixBase64 = 'data:image/png;base64,';
|
const prefixBase64 = 'data:image/png;base64,';
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
name: 'cmr',
|
name: 'cmr',
|
||||||
mixins: [vnReport],
|
mixins: [vnReport],
|
||||||
async serverPrefetch() {
|
async serverPrefetch() {
|
||||||
this.data = await this.findOneFromDef('data', [this.id]);
|
this.data = await this.findOneFromDef('data', [this.id]);
|
||||||
if (this.data.ticketFk) {
|
if (this.data.ticketFk) {
|
||||||
this.merchandises = await this.rawSqlFromDef('merchandise', [this.data.ticketFk]);
|
this.merchandises = await this.rawSqlFromDef('merchandise', [this.data.ticketFk]);
|
||||||
this.signature = await this.findOneFromDef('signature', [this.data.ticketFk]);
|
this.signature = await this.findOneFromDef('signature', [this.data.ticketFk]);
|
||||||
} else
|
} else
|
||||||
this.merchandises = null;
|
this.merchandises = null;
|
||||||
|
|
||||||
this.senderStamp = (this.data.senderStamp)
|
this.senderStamp = (this.data.senderStamp)
|
||||||
? `${prefixBase64} ${this.data.senderStamp.toString('base64')}`
|
? `${prefixBase64} ${this.data.senderStamp.toString('base64')}`
|
||||||
: null;
|
: null;
|
||||||
this.deliveryStamp = (this.data.deliveryStamp)
|
this.deliveryStamp = (this.data.deliveryStamp)
|
||||||
? `${prefixBase64} ${this.data.deliveryStamp.toString('base64')}`
|
? `${prefixBase64} ${this.data.deliveryStamp.toString('base64')}`
|
||||||
: null;
|
: null;
|
||||||
},
|
this.truckPlateQr = await this.getQR(this.data.truckPlate);
|
||||||
props: {
|
},
|
||||||
id: {
|
props: {
|
||||||
type: Number,
|
id: {
|
||||||
required: true,
|
type: Number,
|
||||||
description: 'The cmr id'
|
required: true,
|
||||||
},
|
description: 'The cmr id'
|
||||||
},
|
},
|
||||||
computed: {
|
},
|
||||||
signPath() {
|
computed: {
|
||||||
if (!this.signature) return;
|
signPath() {
|
||||||
|
if (!this.signature) return;
|
||||||
|
|
||||||
const signatureName = this.signature.signature
|
const signatureName = this.signature.signature;
|
||||||
const hash = md5(signatureName.toString()).substring(0, 3);
|
const hash = md5(signatureName.toString()).substring(0, 3);
|
||||||
const file = `${config.storage.root}/${hash}/${signatureName}.png`;
|
const file = `${config.storage.root}/${hash}/${signatureName}.png`;
|
||||||
if (!fs.existsSync(file)) return null;
|
if (!fs.existsSync(file)) return null;
|
||||||
|
|
||||||
return `${prefixBase64} ${Buffer.from(fs.readFileSync(file), 'utf8').toString('base64')}`;
|
return `${prefixBase64} ${Buffer.from(fs.readFileSync(file), 'utf8').toString('base64')}`;
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
};
|
methods: {
|
||||||
|
getQR(id) {
|
||||||
|
return qrcode.toDataURL(String(id), {margin: 0});
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
|
@ -10,6 +10,7 @@ SELECT c.id cmrFk,
|
||||||
c.merchandiseDetail,
|
c.merchandiseDetail,
|
||||||
c.ead,
|
c.ead,
|
||||||
s.name carrierName,
|
s.name carrierName,
|
||||||
|
s.nif carrierCif,
|
||||||
s.street carrierStreet,
|
s.street carrierStreet,
|
||||||
s.postCode carrierPostCode,
|
s.postCode carrierPostCode,
|
||||||
s.city carrierCity,
|
s.city carrierCity,
|
||||||
|
|
Loading…
Reference in New Issue